diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:33 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:33 +0100 |
| commit | ee82970d96e0a6772b24c48aab8ebd1888ec5216 (patch) | |
| tree | 2f284a1671eb3667a4b280b252ecd6e930b5920c /phpBB/language | |
| parent | c9f68f0b5c339cf7c0126eef8e7c533a0107bd66 (diff) | |
| parent | 108312d52a447e3ad5a2e8d1682f0439e5443cf0 (diff) | |
| download | forums-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')
24 files changed, 377 insertions, 229 deletions
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php index 1393933cc8..4d49e1c8c3 100644 --- a/phpBB/language/en/acp/attachments.php +++ b/phpBB/language/en/acp/attachments.php @@ -106,8 +106,10 @@ $lang = array_merge($lang, array( 'NOT_ALLOWED_IN_PM' => 'Not allowed in private messages', 'NOT_ASSIGNED' => 'Not assigned', + 'NO_EXT_GROUP' => 'None', 'NO_EXT_GROUP_NAME' => 'No Group Name entered', 'NO_EXT_GROUP_SPECIFIED' => 'No Extension Group specified', + 'NO_FILE_CAT' => 'None', 'NO_IMAGE' => 'No Image', 'NO_THUMBNAIL_SUPPORT' => 'Thumbnail support has been disabled because there is no supported GD library available and the imagemagick executable could not be found.', 'NO_UPLOAD_DIR' => 'The upload directory you specified does not exist.', @@ -126,8 +128,8 @@ $lang = array_merge($lang, array( 'SECURE_DOWNLOADS_EXPLAIN' => 'With this option enabled, downloads are limited to IP\'s/hostnames you defined.', 'SECURE_DOWNLOAD_NOTICE' => 'Secure Downloads are not enabled. The settings below will be applied after enabling secure downloads.', 'SECURE_DOWNLOAD_UPDATE_SUCCESS'=> 'The IP list has been updated successfully', - 'SECURE_EMPTY_REFERER' => 'Allow empty referer', - 'SECURE_EMPTY_REFERER_EXPLAIN' => 'Secure downloads are based on referers. Do you want to allow downloads for those ommitting the referer?', + 'SECURE_EMPTY_REFERRER' => 'Allow empty referrer', + 'SECURE_EMPTY_REFERRER_EXPLAIN' => 'Secure downloads are based on referrers. Do you want to allow downloads for those ommitting the referrer?', 'SETTINGS_CAT_IMAGES' => 'Image category settings', 'SPECIAL_CATEGORY' => 'Special Category', 'SPECIAL_CATEGORY_EXPLAIN' => 'Special Categories differ between the way presented within posts.', diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php index 683baf03c1..51df843158 100644 --- a/phpBB/language/en/acp/ban.php +++ b/phpBB/language/en/acp/ban.php @@ -47,7 +47,7 @@ $lang = array_merge($lang, array( 'EMAIL_BAN_EXPLAIN' => 'To specify more than one email address enter each on a new line. To match partial addresses use * as the wildcard, e.g. *@hotmail.com, *@*.domain.tld, etc.', 'EMAIL_NO_BANNED' => 'No banned email addresses', 'EMAIL_UNBAN' => 'Un-ban or Un-exclude Emails', - 'EMAIL_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded email addresses have a grey background.', + 'EMAIL_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple email addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded email addresses have a marked background.', 'IP_BAN' => 'Ban one or more ips', 'IP_BAN_EXCLUDE_EXPLAIN' => 'Enable this to exclude the entered IP from all current bans.', @@ -55,7 +55,7 @@ $lang = array_merge($lang, array( 'IP_HOSTNAME' => 'IP addresses or hostnames', 'IP_NO_BANNED' => 'No banned IP addresses', 'IP_UNBAN' => 'Un-ban or Un-exclude IPs', - 'IP_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IP\'s have a grey background.', + 'IP_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple IP addresses in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded IP\'s have a marked background.', 'PERMANENT' => 'Permanent', @@ -65,7 +65,7 @@ $lang = array_merge($lang, array( 'USER_BAN_EXPLAIN' => 'You can ban multiple users in one go by entering each name on a new line. Use the <u>Find a Username</u> facility to look up and add one or more users automatically.', 'USER_NO_BANNED' => 'No banned usernames', 'USER_UNBAN' => 'Un-ban or Un-exclude usernames', - 'USER_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users have a grey background.', + 'USER_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users have a marked background.', )); ?>
\ No newline at end of file diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index d0dc426dda..bf47c1e709 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -99,11 +99,10 @@ $lang = array_merge($lang, array( 'ACP_MESSAGE_SETTINGS_EXPLAIN' => 'Here you can set all default settings for private messaging', 'ALLOW_BBCODE_PM' => 'Allow BBCode in private messages', - 'ALLOW_DOWNLOAD_PM' => 'Allow downloading of attachments in private messages', 'ALLOW_FLASH_PM' => 'Allow use of FLASH BBCode Tag', 'ALLOW_FORWARD_PM' => 'Allow forwarding of private messages', 'ALLOW_IMG_PM' => 'Allow use of IMG BBCode Tag', - 'ALLOW_MASS_PM' => 'Allow Mass PM\'s', + 'ALLOW_MASS_PM' => 'Allow sending of private messages to multiple users and groups', 'ALLOW_PRINT_PM' => 'Allow print view in private messaging', 'ALLOW_QUOTE_PM' => 'Allow quotes in private messages', 'ALLOW_SIG_PM' => 'Allow signature in private messages', @@ -114,7 +113,7 @@ $lang = array_merge($lang, array( 'BOXES_MAX_EXPLAIN' => 'By default users may create this many personal folders for private messages.', 'ENABLE_PM_ICONS' => 'Enable use of topic icons in private messages', 'FULL_FOLDER_ACTION' => 'Full folder default action', - 'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default Action to take if an users folder is full and if the users folder action set is not applicable. For the special folder "SENTBOX" the default action is always deleting old messages.', + 'FULL_FOLDER_ACTION_EXPLAIN'=> 'Default Action to take if an users folder is full and if the users folder action set is not applicable. For the "sent messages" folder the default action is always deleting old messages.', 'HOLD_NEW_MESSAGES' => 'Hold new messages', 'PM_EDIT_TIME' => 'Limit editing time', 'PM_EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a private message not already delivered, zero equals infinity', @@ -134,7 +133,7 @@ $lang = array_merge($lang, array( 'EDIT_TIME_EXPLAIN' => 'Limits the time available to edit a new post, zero equals infinity', 'FLOOD_INTERVAL' => 'Flood Interval', 'FLOOD_INTERVAL_EXPLAIN' => 'Number of seconds a user must wait between posting new messages. To enable users to ignore this alter their permissions.', - 'HOT_THRESHOLD' => 'Posts for Popular Threshold', + 'HOT_THRESHOLD' => 'Posts for Popular Threshold, Set to 0 to disable hot topics.', 'MAX_POLL_OPTIONS' => 'Max number of poll options', 'MAX_POST_FONT_SIZE' => 'Max font size per post', 'MAX_POST_FONT_SIZE_EXPLAIN' => 'Set to 0 for unlimited font size.', @@ -186,12 +185,10 @@ $lang = array_merge($lang, array( 'ALLOW_EMAIL_REUSE_EXPLAIN' => 'Different users can register with the same email address.', 'COPPA' => 'Coppa', 'COPPA_FAX' => 'COPPA Fax Number', - 'COPPA_HIDE_GROUPS' => 'Hide COPPA Groups', - 'COPPA_HIDE_GROUPS_EXPLAIN' => 'Do not display the special COPPA groups within admin-facing parts', 'COPPA_MAIL' => 'COPPA Mailing Address', 'COPPA_MAIL_EXPLAIN' => 'This is the mailing address where parents will send COPPA registration forms', 'ENABLE_COPPA' => 'Enable COPPA', - 'ENABLE_COPPA_EXPLAIN' => 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA act.', + 'ENABLE_COPPA_EXPLAIN' => 'This requires users to declare whether they are 13 or over for compliance with the U.S. COPPA act. If this is disabled the COPPA specific groups will no longer be displayed.', 'MAX_CHARS' => 'Max', 'MIN_CHARS' => 'Min', 'PASSWORD_LENGTH' => 'Password length', @@ -209,8 +206,9 @@ $lang = array_merge($lang, array( // Visual Confirmation Settings $lang = array_merge($lang, array( - 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you are able to define visual confirmation defaults and captcha settings', + 'ACP_VC_SETTINGS_EXPLAIN' => 'Here you are able to define visual confirmation defaults and captcha settings.', + 'BAD_POLICY' => 'The policy you selected is invalid.', 'CAPTCHA_3DBITMAP' => '3D Bitmap', 'CAPTCHA_CELLS' => 'Cells', 'CAPTCHA_COMPOSITE' => 'Composite', @@ -219,11 +217,15 @@ $lang = array_merge($lang, array( 'CAPTCHA_OVERLAP' => 'Overlap', 'CAPTCHA_SHAPE' => 'Shape', 'CAPTCHA_STENCIL' => 'Stencil', + 'CAPTCHA_EXPLAIN' => 'Click %shere%s to preview this CAPTCHA policy.', 'ENTROPY_NOISE_LINE' => 'Entropy line noise', 'ENTROPY_NOISE_PIXEL' => 'Entropy pixel noise', 'HEAVY' => 'Heavy', 'LIGHT' => 'Light', 'MEDIUM' => 'Medium', + 'NO_GD' => 'The server does not support GD, an extension required to enable the advanced CAPTCHA policies. A fall-back method will be used if you decide to enable Visual Confirmation features.', + 'NO_NOISE' => 'None', + 'NO_TTF' => 'The policy you selected requires TTF enabled, the server has TTF disabled. If this policy is enabled, it will be skipped and another policy will be used in its place. If no valid policies are enabled, a fall-back method will be used if you decide to enable Visual Confirmation features.', 'OVERLAP_NOISE_LINE' => 'Overlap line noise', 'OVERLAP_NOISE_PIXEL' => 'Overlap pixel noise', 'SHAPE_NOISE_LINE' => 'Shape line noise', @@ -242,7 +244,7 @@ $lang = array_merge($lang, array( 'COOKIE_NAME' => 'Cookie name', 'COOKIE_PATH' => 'Cookie path', 'COOKIE_SECURE' => 'Cookie secure', - 'COOKIE_SECURE_EXPLAIN' => 'If your server is running via SSL set this to enabled else leave as disabled', + 'COOKIE_SECURE_EXPLAIN' => 'If your server is running via SSL set this to enabled else leave as disabled. Having this enabled and not running via SSL will result in server errors during redirects.', 'ONLINE_LENGTH' => 'View online time span', 'ONLINE_LENGTH_EXPLAIN' => 'Time in minutes after which inactive users will not appear in viewonline listings, lower equals less processing.', 'SESSION_LENGTH' => 'Session length', @@ -265,6 +267,8 @@ $lang = array_merge($lang, array( 'LOAD_USER_ACTIVITY_EXPLAIN' => 'Displays active topic/forum in user profiles and user control panel. It is recommended to disable this on boards with more than one million posts.', 'RECOMPILE_TEMPLATES' => 'Recompile stale templates', 'RECOMPILE_TEMPLATES_EXPLAIN' => 'Check for updated template files on filesystem and recompile.', + 'YES_ANON_READ_MARKING' => 'Enable topic marking for guests', + 'YES_ANON_READ_MARKING_EXPLAIN' => 'Stores read/unread status information for guests. If disabled posts are always read for guests.', 'YES_BIRTHDAYS' => 'Enable birthday listing', 'YES_JUMPBOX' => 'Enable display of Jumpbox', 'YES_MODERATORS' => 'Enable display of Moderators', @@ -282,14 +286,18 @@ $lang = array_merge($lang, array( // Auth settings $lang = array_merge($lang, array( - 'ACP_AUTH_SETTINGS_EXPLAIN' => 'phpBB2 supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.', + 'ACP_AUTH_SETTINGS_EXPLAIN' => 'phpBB supports authentication plug-ins, or modules. These allow you determine how users are authenticated when they log into the board. By default three plug-ins are provided; DB, LDAP and Apache. Not all methods require additional information so only fill out fields if they are relevant to the selected method.', 'AUTH_METHOD' => 'Select an authentication method', + + 'APACHE_SETUP_BEFORE_USE' => 'You have to setup apache authentication before you switch phpBB to this authentication method. Keep in mind that the username you use for apache authentication has to be the same as your phpBB username.', + 'LDAP_DN' => 'LDAP base dn', 'LDAP_DN_EXPLAIN' => 'This is the Distinguished Name, locating the user information, e.g. o=My Company,c=US', + 'LDAP_EMAIL' => 'LDAP email attribute', + 'LDAP_EMAIL_EXPLAIN' => 'Set this to the name of your user entry email attribute (if one exists) in order to automatically set the email address for new users. Leaving this empty results in empty email address for users who log in for the first time.', + 'LDAP_NO_EMAIL' => 'The specified email attribute does not exist.', 'LDAP_NO_IDENTITY' => 'Could not find a login identity for %s', - 'LDAP_NO_LDAP_EXTENSION' => 'LDAP extension not availible', - 'LDAP_NO_SERVER_CONNECTION' => 'Could not connect to LDAP server', 'LDAP_SERVER' => 'LDAP server name', 'LDAP_SERVER_EXPLAIN' => 'If using LDAP this is the name or IP address of the server.', 'LDAP_UID' => 'LDAP uid', @@ -342,6 +350,7 @@ $lang = array_merge($lang, array( 'IP_VALID_EXPLAIN' => 'Determines how much of the users IP is used to validate a session; All compares the complete address, A.B.C the first x.x.x, A.B the first x.x, None disables checking.', 'MAX_LOGIN_ATTEMPTS' => 'Maximum number of login attempts', 'MAX_LOGIN_ATTEMPTS_EXPLAIN' => 'After this number of failed logins the user needs to additionally confirm his login visually (visual confirmation)', + 'NO_IP_VALIDATION' => 'None', 'PASSWORD_TYPE' => 'Password complexity', 'PASSWORD_TYPE_EXPLAIN' => 'Determines how complex a password needs to be when set or altered, subsequent options include the previous ones.', 'PASS_TYPE_ALPHA' => 'Must contain alphanumerics', diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index 5b875b4916..0847ff44c9 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -53,6 +53,8 @@ $lang = array_merge($lang, array( 'ACP_BOARD_SETTINGS' => 'Board Settings', 'ACP_BOTS' => 'Spiders/Robots', + 'ACP_CAPTCHA' => 'CAPTCHA', + 'ACP_CAT_DATABASE' => 'Database', 'ACP_CAT_DOT_MODS' => '.Mods', 'ACP_CAT_FORUMS' => 'Forums', @@ -175,6 +177,7 @@ $lang = array_merge($lang, array( 'ACP_USER_SIG' => 'Signature', 'ACP_VC_SETTINGS' => 'Visual Confirmation Settings', + 'ACP_VC_CAPTCHA_DISPLAY' => 'CAPTCHA Image Preview', 'ACP_VERSION_CHECK' => 'Check for Updates', 'ACP_VIEW_ADMIN_PERMISSIONS' => 'View Admin Permissions', 'ACP_VIEW_FORUM_MOD_PERMISSIONS' => 'View Forum Moderator Permissions', @@ -185,6 +188,7 @@ $lang = array_merge($lang, array( 'ACP_WORDS' => 'Word Censoring', 'ACTION' => 'Action', + 'ACTIONS' => 'Actions', 'ACTIVATE' => 'Activate', 'ADD' => 'Add', 'ADMIN' => 'Administration', @@ -233,7 +237,6 @@ $lang = array_merge($lang, array( 'NOTIFY' => 'Notification', 'NO_ADMIN' => 'You are not authorised to administer this board.', 'NO_EMAILS_DEFINED' => 'No valid email addresses found', - 'NO_IPS_DEFINED' => 'No IPs or Hostnames defined', 'OFF' => 'OFF', 'ON' => 'ON', @@ -241,7 +244,7 @@ $lang = array_merge($lang, array( 'PARSE_BBCODE' => 'Parse BBCode', 'PARSE_SMILIES' => 'Parse Smilies', 'PARSE_URLS' => 'Parse Links', - 'PROCEED_TO_ACP' => 'Click %sHere%s to proceed to the ACP', + 'PROCEED_TO_ACP' => '%sProceed to the ACP%s', 'REMIND' => 'Remind', 'REORDER' => 'Reorder', 'RESYNC' => 'Sync', @@ -285,12 +288,13 @@ $lang = array_merge($lang, array( $lang = array_merge($lang, array( 'ADMIN_INTRO' => 'Thank you for choosing phpBB as your forum solution. This screen will give you a quick overview of all the various statistics of your board. The links on the left hand side of this screen allow you to control every aspect of your forum experience. Each page will have instructions on how to use the tools.', 'ADMIN_LOG' => 'Logged administrator actions', - 'ADMIN_LOG_INDEX_EXPLAIN' => 'This gives an overview of the last five actions carried out by board administrators. A full copy of the log can be viewed from the appropriate menu item to the left.', + 'ADMIN_LOG_INDEX_EXPLAIN' => 'This gives an overview of the last five actions carried out by board administrators. A full copy of the log can be viewed from the appropriate menu item or following the link below.', 'AVATAR_DIR_SIZE' => 'Avatar directory size', 'BOARD_STARTED' => 'Board started', - 'DATABASE_SIZE' => 'Database size', + 'DATABASE_SERVER_INFO' => 'Database server', + 'DATABASE_SIZE' => 'Database size', 'FILES_PER_DAY' => 'Attachments per day', 'FORUM_STATS' => 'Forum Statistics', @@ -323,11 +327,12 @@ $lang = array_merge($lang, array( 'USERS_PER_DAY' => 'Users per day', 'VALUE' => 'Value', + 'VIEW_ADMIN_LOG' => 'View administrator log', 'WELCOME_PHPBB' => 'Welcome to phpBB', )); -// Log +// Log Entries $lang = array_merge($lang, array( 'LOG_ACL_ADD_USER_GLOBAL_U_' => '<b>Added or edited users user permissions</b><br />» %s', 'LOG_ACL_ADD_GROUP_GLOBAL_U_' => '<b>Added or edited groups user permissions</b><br />» %s', @@ -339,18 +344,18 @@ $lang = array_merge($lang, array( 'LOG_ACL_ADD_ADMIN_GLOBAL_A_' => '<b>Added or edited Administrators</b><br />» %s', 'LOG_ACL_ADD_MOD_GLOBAL_M_' => '<b>Added or edited Global Moderators</b><br />» %s', - 'LOG_ACL_ADD_USER_LOCAL_F_' => '<b>Added or edited users forum access</b> from %s<br />» %s', - 'LOG_ACL_ADD_USER_LOCAL_M_' => '<b>Added or edited users forum moderator access</b> from %s<br />» %s', - 'LOG_ACL_ADD_GROUP_LOCAL_F_' => '<b>Added or edited groups forum access</b> from %s<br />» %s', - 'LOG_ACL_ADD_GROUP_LOCAL_M_' => '<b>Added or edited groups forum moderator access</b> from %s<br />» %s', + 'LOG_ACL_ADD_USER_LOCAL_F_' => '<b>Added or edited users forum access</b> from %1$s<br />» %2$s', + 'LOG_ACL_ADD_USER_LOCAL_M_' => '<b>Added or edited users forum moderator access</b> from %1$s<br />» %2$s', + 'LOG_ACL_ADD_GROUP_LOCAL_F_' => '<b>Added or edited groups forum access</b> from %1$s<br />» %2$s', + 'LOG_ACL_ADD_GROUP_LOCAL_M_' => '<b>Added or edited groups forum moderator access</b> from %1$s<br />» %2$s', - 'LOG_ACL_ADD_MOD_LOCAL_M_' => '<b>Added or edited Moderators</b> from %s<br />» %s', - 'LOG_ACL_ADD_FORUM_LOCAL_F_' => '<b>Added or edited Forum Permissions</b> from %s<br />» %s', + 'LOG_ACL_ADD_MOD_LOCAL_M_' => '<b>Added or edited Moderators</b> from %1$s<br />» %2$s', + 'LOG_ACL_ADD_FORUM_LOCAL_F_' => '<b>Added or edited Forum Permissions</b> from %1$s<br />» %2$s', 'LOG_ACL_DEL_ADMIN_GLOBAL_A_' => '<b>Removed Administrators</b><br />» %s', 'LOG_ACL_DEL_MOD_GLOBAL_M_' => '<b>Removed Global Moderators</b><br />» %s', - 'LOG_ACL_DEL_MOD_LOCAL_M_' => '<b>Removed Moderators</b> from %s<br />» %s', - 'LOG_ACL_DEL_FORUM_LOCAL_F_' => '<b>Removed User/Group Forum Permissions</b> from %s<br />» %s', + 'LOG_ACL_DEL_MOD_LOCAL_M_' => '<b>Removed Moderators</b> from %1$s<br />» %2$s', + 'LOG_ACL_DEL_FORUM_LOCAL_F_' => '<b>Removed User/Group Forum Permissions</b> from %1$s<br />» %2$s', 'LOG_ACL_TRANSFER_PERMISSIONS' => '<b>Permissions transfered from</b><br />» %s', 'LOG_ACL_RESTORE_PERMISSIONS' => '<b>Own permissions restored after using permissions from</b><br />» %s', @@ -367,12 +372,12 @@ $lang = array_merge($lang, array( 'LOG_ATTACH_FILEUPLOAD' => '<b>Orphan File uploaded to Post</b><br />» ID %1$d - %2$s', 'LOG_ATTACH_ORPHAN_DEL' => '<b>Orphan Files deleted</b><br />» %s', - 'LOG_BAN_EXCLUDE_USER' => '<b>Excluded user from ban</b> for reason "<i>%s</i>"<br />» %s ', - 'LOG_BAN_EXCLUDE_IP' => '<b>Excluded ip from ban</b> for reason "<i>%s</i>"<br />» %s ', - 'LOG_BAN_EXCLUDE_EMAIL' => '<b>Excluded email from ban</b> for reason "<i>%s</i>"<br />» %s ', - 'LOG_BAN_USER' => '<b>Banned User</b> for reason "<i>%s</i>"<br />» %s ', - 'LOG_BAN_IP' => '<b>Banned ip</b> for reason "<i>%s</i>"<br />» %s', - 'LOG_BAN_EMAIL' => '<b>Banned email</b> for reason "<i>%s</i>"<br />» %s', + 'LOG_BAN_EXCLUDE_USER' => '<b>Excluded user from ban</b> for reason "<i>%1$s</i>"<br />» %2$s ', + 'LOG_BAN_EXCLUDE_IP' => '<b>Excluded ip from ban</b> for reason "<i>%1$s</i>"<br />» %2$s ', + 'LOG_BAN_EXCLUDE_EMAIL' => '<b>Excluded email from ban</b> for reason "<i>%1$s</i>"<br />» %2$s ', + 'LOG_BAN_USER' => '<b>Banned User</b> for reason "<i>%1$s</i>"<br />» %2$s ', + 'LOG_BAN_IP' => '<b>Banned ip</b> for reason "<i>%1$s</i>"<br />» %2$s', + 'LOG_BAN_EMAIL' => '<b>Banned email</b> for reason "<i>%1$s</i>"<br />» %2$s', 'LOG_UNBAN_USER' => '<b>Unbanned user</b><br />» %s', 'LOG_UNBAN_IP' => '<b>Unbanned ip</b><br />» %s', 'LOG_UNBAN_EMAIL' => '<b>Unbanned email</b><br />» %s', @@ -439,28 +444,28 @@ $lang = array_merge($lang, array( 'LOG_FORUM_ADD' => '<b>Created new forum</b><br />» %s', 'LOG_FORUM_DEL_FORUM' => '<b>Deleted forum</b><br />» %s', 'LOG_FORUM_DEL_FORUMS' => '<b>Deleted forum and its subforums</b><br />» %s', - 'LOG_FORUM_DEL_MOVE_FORUMS' => '<b>Deleted forum and moved subforums</b> to %s<br />» %s', - 'LOG_FORUM_DEL_MOVE_POSTS' => '<b>Deleted forum and moved posts </b> to %s<br />» %s', - 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => '<b>Deleted forum and its subforums, moved messages</b> to %s<br />» %s', - 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => '<b>Deleted forum, moved posts</b> to %s <b>and subforums</b> to %s<br />» %s', + 'LOG_FORUM_DEL_MOVE_FORUMS' => '<b>Deleted forum and moved subforums</b> to %1$s<br />» %2$s', + 'LOG_FORUM_DEL_MOVE_POSTS' => '<b>Deleted forum and moved posts </b> to %1$s<br />» %2$s', + 'LOG_FORUM_DEL_MOVE_POSTS_FORUMS' => '<b>Deleted forum and its subforums, moved messages</b> to %1$s<br />» %2$s', + 'LOG_FORUM_DEL_MOVE_POSTS_MOVE_FORUMS' => '<b>Deleted forum, moved posts</b> to %1$s <b>and subforums</b> to %2$s<br />» %3$s', 'LOG_FORUM_DEL_POSTS' => '<b>Deleted forum and its messages</b><br />» %s', 'LOG_FORUM_DEL_POSTS_FORUMS' => '<b>Deleted forum, its messages and subforums</b><br />» %s', - 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => '<b>Deleted forum and its messages, moved subforums</b> to %s<br />» %s', + 'LOG_FORUM_DEL_POSTS_MOVE_FORUMS' => '<b>Deleted forum and its messages, moved subforums</b> to %1$s<br />» %2$s', 'LOG_FORUM_EDIT' => '<b>Edited forum details</b><br />» %s', - 'LOG_FORUM_MOVE_DOWN' => '<b>Moved forum</b> %s <b>below</b> %s', - 'LOG_FORUM_MOVE_UP' => '<b>Moved forum</b> %s <b>above</b> %s', + 'LOG_FORUM_MOVE_DOWN' => '<b>Moved forum</b> %1$s <b>below</b> %2$s', + 'LOG_FORUM_MOVE_UP' => '<b>Moved forum</b> %1$s <b>above</b> %2$s', 'LOG_FORUM_SYNC' => '<b>Re-synchronised forum</b><br />» %s', 'LOG_GROUP_CREATED' => '<b>New usergroup created</b><br />» %s', 'LOG_GROUP_DEFAULTS' => '<b>Group made default for members</b><br />» %s', 'LOG_GROUP_DELETE' => '<b>Usergroup deleted</b><br />» %s', - 'LOG_GROUP_DEMOTED' => '<b>Leaders demoted in usergroup</b> %s<br />» %s', - 'LOG_GROUP_PROMOTED' => '<b>Members promoted to leader in usergroup</b> %s<br />» %s', - 'LOG_GROUP_REMOVE' => '<b>Members removed from usergroup</b> %s<br />» %s', + 'LOG_GROUP_DEMOTED' => '<b>Leaders demoted in usergroup</b> %1$s<br />» %2$s', + 'LOG_GROUP_PROMOTED' => '<b>Members promoted to leader in usergroup</b> %1$s<br />» %2$s', + 'LOG_GROUP_REMOVE' => '<b>Members removed from usergroup</b> %1$s<br />» %2$s', 'LOG_GROUP_UPDATED' => '<b>Usergroup details updated</b><br />» %s', - 'LOG_MODS_ADDED' => '<b>Added new leaders to usergroup</b> %s<br />» %s', - 'LOG_USERS_APPROVED' => '<b>Users approved in usergroup</b> %s<br />» %s', - 'LOG_USERS_ADDED' => '<b>Added new members to usergroup</b> %s<br />» %s', + 'LOG_MODS_ADDED' => '<b>Added new leaders to usergroup</b> %1$s<br />» %2$s', + 'LOG_USERS_APPROVED' => '<b>Users approved in usergroup</b> %1$s<br />» %2$s', + 'LOG_USERS_ADDED' => '<b>Added new members to usergroup</b> %1$s<br />» %2$s', 'LOG_IMAGESET_ADD_DB' => '<b>Added new imageset to database</b><br />» %s', 'LOG_IMAGESET_ADD_FS' => '<b>Add new imageset on filesystem</b><br />» %s', @@ -468,13 +473,15 @@ $lang = array_merge($lang, array( 'LOG_IMAGESET_EDIT_DETAILS' => '<b>Edited imageset details</b><br />» %s', 'LOG_IMAGESET_EDIT' => '<b>Edited imageset</b><br />» %s', 'LOG_IMAGESET_EXPORT' => '<b>Exported imageset</b><br />» %s', + 'LOG_IMAGESET_REFRESHED' => '<b>Refreshed imageset</b><br />» %s', 'LOG_INDEX_ACTIVATE' => '<b>Activated inactive users</b><br />» %s', 'LOG_INDEX_DELETE' => '<b>Deleted inactive users</b><br />» %s', 'LOG_INDEX_REMIND' => '<b>Sent reminder emails to inactive users</b><br />» %s', + 'LOG_INSTALL_CONVERTED' => '<b>Converted from %1$s to phpBB %2$s</b>', 'LOG_INSTALL_INSTALLED' => '<b>Installed phpBB %s</b>', - 'LOG_IP_BROWSER_CHECK' => '<b>Session IP/Browser check failed</b><br />»User IP "<i>%s</i>" checked against session IP "<i>%s</i>" and user browser string "<i>%s</i>" checked against session browser string "<i>%s</i>".', + 'LOG_IP_BROWSER_CHECK' => '<b>Session IP/Browser check failed</b><br />»User IP "<i>%1$s</i>" checked against session IP "<i>%2$s</i>" and user browser string "<i>%3$s</i>" checked against session browser string "<i>%4$s</i>".', 'LOG_JAB_CHANGED' => '<b>Jabber account changed</b>', 'LOG_JAB_PASSCHG' => '<b>Jabber password changed</b>', @@ -488,7 +495,7 @@ $lang = array_merge($lang, array( 'LOG_MASS_EMAIL' => '<b>Sent mass email</b><br />» %s', - 'LOG_MCP_CHANGE_POSTER' => '<b>Changed poster in topic "%s"</b><br />» from %s to %s', + 'LOG_MCP_CHANGE_POSTER' => '<b>Changed poster in topic "%1$s"</b><br />» from %2$s to %3$s', 'LOG_MODULE_DISABLE' => '<b>Module disabled</b>', 'LOG_MODULE_ENABLE' => '<b>Module enabled</b>', @@ -540,9 +547,9 @@ $lang = array_merge($lang, array( 'LOG_TEMPLATE_ADD_DB' => '<b>Added new template set to database</b><br />» %s', 'LOG_TEMPLATE_ADD_FS' => '<b>Add new template set on filesystem</b><br />» %s', - 'LOG_TEMPLATE_CACHE_CLEARED' => '<b>Deleted cached versions of template files in template set <i>%s</i></b><br />» %s', + 'LOG_TEMPLATE_CACHE_CLEARED' => '<b>Deleted cached versions of template files in template set <i>%1$s</i></b><br />» %2$s', 'LOG_TEMPLATE_DELETE' => '<b>Deleted template set</b><br />» %s', - 'LOG_TEMPLATE_EDIT' => '<b>Edited template set <i>%s</i></b><br />» %s', + 'LOG_TEMPLATE_EDIT' => '<b>Edited template set <i>%1$s</i></b><br />» %2$s', 'LOG_TEMPLATE_EDIT_DETAILS' => '<b>Edited template details</b><br />» %s', 'LOG_TEMPLATE_EXPORT' => '<b>Exported template set</b><br />» %s', 'LOG_TEMPLATE_REFRESHED' => '<b>Refreshed template set</b><br />» %s', @@ -551,25 +558,26 @@ $lang = array_merge($lang, array( 'LOG_THEME_ADD_FS' => '<b>Add new theme on filesystem</b><br />» %s', 'LOG_THEME_DELETE' => '<b>Theme deleted</b><br />» %s', 'LOG_THEME_EDIT_DETAILS' => '<b>Edited theme details</b><br />» %s', - 'LOG_THEME_EDIT' => '<b>Edited theme <i>%s</i></b><br />» Modified class <i>%s</i>', - 'LOG_THEME_EDIT_ADD' => '<b>Edited theme <i>%s</i></b><br />» Added class <i>%s</i>', + 'LOG_THEME_EDIT' => '<b>Edited theme <i>%1$s</i></b><br />» Modified class <i>%2$s</i>', + 'LOG_THEME_EDIT_ADD' => '<b>Edited theme <i>%1$s</i></b><br />» Added class <i>%2$s</i>', 'LOG_THEME_EXPORT' => '<b>Exported theme</b><br />» %s', + 'LOG_THEME_REFRESHED' => '<b>Refreshed theme</b><br />» %s', 'LOG_USER_ACTIVE' => '<b>User activated</b><br />» %s', - 'LOG_USER_BAN_USER' => '<b>Banned User via user management</b> for reason "<i>%s</i>"<br />» %s', - 'LOG_USER_BAN_IP' => '<b>Banned ip via user management</b> for reason "<i>%s</i>"<br />» %s', - 'LOG_USER_BAN_EMAIL' => '<b>Banned email via user management</b> for reason "<i>%s</i>"<br />» %s', + 'LOG_USER_BAN_USER' => '<b>Banned User via user management</b> for reason "<i>%1$s</i>"<br />» %2$s', + 'LOG_USER_BAN_IP' => '<b>Banned ip via user management</b> for reason "<i>%1$s</i>"<br />» %2$s', + 'LOG_USER_BAN_EMAIL' => '<b>Banned email via user management</b> for reason "<i>%1$s</i>"<br />» %2$s', 'LOG_USER_DELETED' => '<b>Deleted user</b><br />» %s', 'LOG_USER_DEL_ATTACH' => '<b>Removed all attachments made by the user</b><br />» %s', 'LOG_USER_DEL_AVATAR' => '<b>Removed user avatar</b><br />» %s', 'LOG_USER_DEL_POSTS' => '<b>Removed all posts made by the user</b><br />» %s', 'LOG_USER_DEL_SIG' => '<b>Removed user signature</b><br />» %s', 'LOG_USER_INACTIVE' => '<b>User deactivated</b><br />» %s', - 'LOG_USER_MOVE_POSTS' => '<b>Moved user posts</b><br />» posts by "%s" to forum "%s"', + 'LOG_USER_MOVE_POSTS' => '<b>Moved user posts</b><br />» posts by "%1$s" to forum "%2$s"', 'LOG_USER_NEW_PASSWORD' => '<b>Changed user password</b><br />» %s', 'LOG_USER_REACTIVATE' => '<b>Forced user account re-activation</b><br />» %s', - 'LOG_USER_UPDATE_EMAIL' => '<b>User "%s" changed email</b><br />» from "%s" to "%s"', - 'LOG_USER_UPDATE_NAME' => '<b>Changed username</b><br />» from "%s" to "%s"', + 'LOG_USER_UPDATE_EMAIL' => '<b>User "%1$s" changed email</b><br />» from "%2$s" to "%3$s"', + 'LOG_USER_UPDATE_NAME' => '<b>Changed username</b><br />» from "%1$s" to "%2$s"', 'LOG_USER_USER_UPDATE' => '<b>Updated user details</b><br />» %s', 'LOG_USER_ACTIVE_USER' => '<b>User account activated</b>', diff --git a/phpBB/language/en/acp/database.php b/phpBB/language/en/acp/database.php index 2799050149..16e10978ff 100644 --- a/phpBB/language/en/acp/database.php +++ b/phpBB/language/en/acp/database.php @@ -48,7 +48,7 @@ $lang = array_merge($lang, array( 'BACKUP_DELETE' => 'The backup file has been deleted successfully', 'STORE_AND_DOWNLOAD' => 'Store and Download', - 'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. You can <u>either</u> upload the backup file via this form or upload it manually to a location on the server. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <b>WARNING</b> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete.', + 'ACP_RESTORE_EXPLAIN' => 'This will perform a full restore of all phpBB tables from a saved file. If your server supports it you may use a gzip or bzip2 compressed text file and it will automatically be decompressed. <b>WARNING</b> This will overwrite any existing data. The restore may take a long time to process please do not move from this page till it is complete.', 'SELECT_FILE' => 'Select a file', 'RESTORE_OPTIONS' => 'Restore options', 'START_RESTORE' => 'Start Restore', diff --git a/phpBB/language/en/acp/forums.php b/phpBB/language/en/acp/forums.php index ff12e687e8..eec59c446b 100644 --- a/phpBB/language/en/acp/forums.php +++ b/phpBB/language/en/acp/forums.php @@ -38,7 +38,8 @@ $lang = array_merge($lang, array( 'AUTO_PRUNE_VIEWED_EXPLAIN' => 'Number of days since topic was viewed after which topic is removed.', 'COPY_PERMISSIONS' => 'Copy permissions from', - 'COPY_PERMISSIONS_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.', + 'COPY_PERMISSIONS_ADD_EXPLAIN' => 'Once created, the forum will have the same permissions as the one you select here. If no forum is selected the newly created forum will not be visible until permissions had been set.', + 'COPY_PERMISSIONS_EDIT_EXPLAIN' => 'If you select to copy permissions, the forum will have the same permissions as the one you select here. This will overwrite any permissions you have previously set for this forum with the permissions of the forum you select here. If no forum is selected the current permissions will be kept.', 'CREATE_FORUM' => 'Create new forum', 'DECIDE_MOVE_DELETE_CONTENT' => 'Delete content or move to forum', @@ -48,12 +49,14 @@ $lang = array_merge($lang, array( 'DISPLAY_ACTIVE_TOPICS' => 'Enable active topics', 'DISPLAY_ACTIVE_TOPICS_EXPLAIN' => 'If set to yes active topics in selected subforums will be displayed under this category.', - 'EDIT_FORUM' => 'Edit forum', - 'ENABLE_INDEXING' => 'Enable search indexing', - 'ENABLE_INDEXING_EXPLAIN' => 'If set to yes posts made to this forum will be indexed for searching.', - 'ENABLE_RECENT' => 'Display active topics', - 'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.', - 'ENABLE_TOPIC_ICONS' => 'Enable Topic Icons', + 'EDIT_FORUM' => 'Edit forum', + 'ENABLE_INDEXING' => 'Enable search indexing', + 'ENABLE_INDEXING_EXPLAIN' => 'If set to yes posts made to this forum will be indexed for searching.', + 'ENABLE_POST_REVIEW' => 'Enable post review', + 'ENABLE_POST_REVIEW_EXPLAIN' => 'If set to yes users are able to review their post if new posts were made to the topic while users wrote theirs. This should be disabled for chat forums.', + 'ENABLE_RECENT' => 'Display active topics', + 'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the active topics list.', + 'ENABLE_TOPIC_ICONS' => 'Enable Topic Icons', 'FORUM_ADMIN' => 'Forum Administration', 'FORUM_ADMIN_EXPLAIN' => 'In phpBB3 there are no categories, everything is forum based. Each forum can have an unlimited number of sub-forums and you can determine whether each may be posted to or not (i.e. whether it acts like an old category). Here you can add, edit, delete, lock, unlock individual forums as well as set certain additional controls. If your posts and topics have got out of sync you can also resynchronise a forum.', @@ -80,6 +83,7 @@ $lang = array_merge($lang, array( 'FORUM_PASSWORD_CONFIRM_EXPLAIN' => 'Only needs to be set if a forum password is entered.', 'FORUM_PASSWORD_EXPLAIN' => 'Defines a password for this forum, use the permission system in preference.', 'FORUM_PASSWORD_MISMATCH' => 'The passwords you entered did not match.', + 'FORUM_PRUNE_SETTINGS' => 'Forum prune settings', 'FORUM_RESYNCED' => 'Forum "%s" successfully resynced', 'FORUM_RULES_EXPLAIN' => 'Forum Rules are displayed at any page within the given forum.', 'FORUM_RULES_LINK' => 'Link to Forum Rules', diff --git a/phpBB/language/en/acp/groups.php b/phpBB/language/en/acp/groups.php index 0ab209204a..03c02b97fc 100644 --- a/phpBB/language/en/acp/groups.php +++ b/phpBB/language/en/acp/groups.php @@ -48,7 +48,7 @@ $lang = array_merge($lang, array( 'GROUP_COLOR_EXPLAIN' => 'Defines the colour members usernames will appear in, leave blank for user default.', 'GROUP_CREATED' => 'Group has been created successfully', 'GROUP_DEFAULT' => 'Default', - 'GROUP_DEFS_UPDATED' => 'Default group set for all members', + 'GROUP_DEFS_UPDATED' => 'Default group set for all selected members', 'GROUP_DELETE' => 'Delete', 'GROUP_DELETED' => 'Group deleted and user default groups set successfully', 'GROUP_DEMOTE' => 'Demote', @@ -89,6 +89,9 @@ $lang = array_merge($lang, array( 'GROUP_USERS_EXIST' => 'The selected users are already members.', 'GROUP_USERS_REMOVE' => 'Users removed from group and new defaults set successfully', + 'MAKE_DEFAULT_FOR_ALL' => 'Make default group for every member', + 'MEMBERS' => 'Members', + 'NO_GROUP' => 'No group specified', 'NO_PERMISSIONS' => 'Do not copy permissions', diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php index 0dd8fe62d3..b5055570c1 100644 --- a/phpBB/language/en/acp/modules.php +++ b/phpBB/language/en/acp/modules.php @@ -55,7 +55,7 @@ $lang = array_merge($lang, array( 'MODULE_ADDED' => 'Module successfully added', 'MODULE_DELETED' => 'Module successfully removed', 'MODULE_DISPLAYED' => 'Module displayed', - 'MODULE_DISPLAYED_EXPLAIN' => 'If you do not whish to display this module, but want to use it, set this to no.', + 'MODULE_DISPLAYED_EXPLAIN' => 'If you do not wish to display this module, but want to use it, set this to no.', 'MODULE_EDITED' => 'Module successfully edited', 'MODULE_ENABLED' => 'Module enabled', 'MODULE_LANGNAME' => 'Module Language Name', diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php index d41fbbea58..1b0513b2f3 100644 --- a/phpBB/language/en/acp/permissions.php +++ b/phpBB/language/en/acp/permissions.php @@ -49,9 +49,9 @@ $lang = array_merge($lang, array( <p>For further information on setting up and managing permissions on your phpBB3 forum, please see <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/quick_permissions.html">Chapter 1.5 of our Quick Start Guide</a>.</p> ', - 'ACL_NO' => 'No', + 'ACL_NEVER' => 'Never', 'ACL_SET' => 'Setting Permissions', - 'ACL_SET_EXPLAIN' => 'Permissions are based on a simple YES/NO system. Setting an option to NO for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select UNSET. If values are assigned for this option elsewhere they will be used in preference, else NO is assumed. All objects marked (with the checkbox in front of them) will inherit the permission set you defined.', + 'ACL_SET_EXPLAIN' => 'Permissions are based on a simple YES/NO system. Setting an option to NEVER for a user or usergroup overrides any other value assigned to it. If you do not wish to assign a value for an option for this user or group select NO. If values are assigned for this option elsewhere they will be used in preference, else NEVER is assumed. All objects marked (with the checkbox in front of them) will copy the permission set you defined.', 'ACL_SETTING' => 'Setting', 'ACL_TYPE_A_' => 'Administrative Permissions', @@ -65,7 +65,7 @@ $lang = array_merge($lang, array( 'ACL_TYPE_LOCAL_M_' => 'Forum Moderator Permissions', 'ACL_TYPE_LOCAL_F_' => 'Forum Permissions', - 'ACL_UNSET' => 'Unset', + 'ACL_NO' => 'No', 'ACL_VIEW' => 'Viewing Permissions', 'ACL_VIEW_EXPLAIN' => 'Here you can see the effective permissions the user/group is having. A red square indicates that the user/group does not have the permission, a green square indicates that the user/group does have the permission.', 'ACL_YES' => 'Yes', @@ -92,8 +92,8 @@ $lang = array_merge($lang, array( 'ADD_PERMISSIONS' => 'Add Permissions', 'ADD_USERS' => 'Add Users', 'ALL_GROUPS' => 'Select all groups', + 'ALL_NEVER' => 'All Never', 'ALL_NO' => 'All No', - 'ALL_UNSET' => 'All Unset', 'ALL_USERS' => 'Select all users', 'ALL_YES' => 'All Yes', 'APPLY_ALL_PERMISSIONS' => 'Apply all Permissions', @@ -124,10 +124,11 @@ $lang = array_merge($lang, array( 'NO_AUTH_SETTING_FOUND' => 'Permission settings not defined.', 'NO_ROLE_ASSIGNED' => 'No role assigned...', - 'NO_ROLE_ASSIGNED_EXPLAIN' => 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the "All Unset" link.', + 'NO_ROLE_ASSIGNED_EXPLAIN' => 'Setting to this role does not change permissions on the right. If you want to unset/remove all permissions you should use the "All No" link.', 'NO_ROLE_AVAILABLE' => 'No role available', 'NO_ROLE_NAME_SPECIFIED' => 'Please give the role a name.', 'NO_ROLE_SELECTED' => 'Role could not be found.', + 'NO_USER_GROUP_SELECTED' => 'You haven\'t selected any user or group.', 'ONLY_FORUM_DEFINED' => 'You only defined forums in your selection. Please also select at least one user or one group.', @@ -182,30 +183,30 @@ $lang = array_merge($lang, array( 'SET_USERS_PERMISSIONS' => 'Set users permissions', 'SET_USERS_FORUM_PERMISSIONS' => 'Set users forum permissions', - 'TRACE_DEFAULT' => 'By default every permission is UNSET. So the permission can be overwritten by other settings.', + 'TRACE_DEFAULT' => 'By default every permission is NO (unset). So the permission can be overwritten by other settings.', 'TRACE_FOR' => 'Trace for', 'TRACE_GLOBAL_SETTING' => '%s (global)', - 'TRACE_GROUP_NO_TOTAL_NO' => 'This group\'s permission is set to NO like the total result so the old result is kept.', - 'TRACE_GROUP_NO_TOTAL_UNSET' => 'This group\'s permission is set to NO which becomes the new total value because it wasn\'t set yet.', - 'TRACE_GROUP_NO_TOTAL_YES' => 'This group\'s permission is set to NO which overwrites the total YES to a NO for this user.', - 'TRACE_GROUP_UNSET' => 'The permission is UNSET for this group so the old total value is kept.', - 'TRACE_GROUP_YES_TOTAL_NO' => 'This group\'s permission is set to YES but the total NO cannot be overwritten.', - 'TRACE_GROUP_YES_TOTAL_UNSET' => 'This group\'s permission is set to YES which becomes the new total value because it wasn\'t set yet.', + 'TRACE_GROUP_NEVER_TOTAL_NEVER' => 'This group\'s permission is set to NEVER like the total result so the old result is kept.', + 'TRACE_GROUP_NEVER_TOTAL_NO' => 'This group\'s permission is set to NEVER which becomes the new total value because it wasn\'t set yet (set to NO).', + 'TRACE_GROUP_NEVER_TOTAL_YES' => 'This group\'s permission is set to NEVER which overwrites the total YES to a NEVER for this user.', + 'TRACE_GROUP_NO' => 'The permission is NO for this group so the old total value is kept.', + 'TRACE_GROUP_YES_TOTAL_NEVER' => 'This group\'s permission is set to YES but the total NEVER cannot be overwritten.', + 'TRACE_GROUP_YES_TOTAL_NO' => 'This group\'s permission is set to YES which becomes the new total value because it wasn\'t set yet (set to NO).', 'TRACE_GROUP_YES_TOTAL_YES' => 'This group\'s permission is set to YES and the total permission is already set to YES, so the total result is kept.', 'TRACE_PERMISSION' => 'Trace permission - %s', 'TRACE_SETTING' => 'Trace setting', - 'TRACE_USER_GLOBAL_YES_TOTAL_YES' => 'The forum independent user permission evaluates to YES but the total permission is already set to YES, so the the total result is kept. %sTrace global permission%s', - 'TRACE_USER_GLOBAL_YES_TOTAL_NO' => 'The forum independent user permission evaluates to YES which overwrites the current local result NO. %sTrace global permission%s', - 'TRACE_USER_GLOBAL_NO_TOTAL_KEPT' => 'The forum independent user permission evaluates to NO which doesn\'t influence the local permission. %sTrace global permission%s', + 'TRACE_USER_GLOBAL_YES_TOTAL_YES' => 'The forum independent user permission evaluates to YES but the total permission is already set to YES, so the the total result is kept. %sTrace global permission%s', + 'TRACE_USER_GLOBAL_YES_TOTAL_NEVER' => 'The forum independent user permission evaluates to YES which overwrites the current local result NEVER. %sTrace global permission%s', + 'TRACE_USER_GLOBAL_NEVER_TOTAL_KEPT' => 'The forum independent user permission evaluates to NEVER which doesn\'t influence the local permission. %sTrace global permission%s', 'TRACE_USER_FOUNDER' => 'The user has the founder type set, therefore admin permissions are set to YES by default.', - 'TRACE_USER_KEPT' => 'The user permission is UNSET so the old total value is kept.', - 'TRACE_USER_NO_TOTAL_NO' => 'The user permission is set to NO and the total value is set to NO, so nothing is changed.', - 'TRACE_USER_NO_TOTAL_UNSET' => 'The user permission is set to NO which becomes the total value because it wasn\'t set yet.', - 'TRACE_USER_NO_TOTAL_YES' => 'The user permission is set to NO and overwrites the previous YES.', - 'TRACE_USER_UNSET_TOTAL_UNSET' => 'The user permission is UNSET and the total value wasn\'t set yet so it defaults to NO.', - 'TRACE_USER_YES_TOTAL_NO' => 'The user permission is set to YES but the total NO cannot be overwritten.', - 'TRACE_USER_YES_TOTAL_UNSET' => 'The user permission is set to YES which becomes the total value because it wasn\'t set yet.', + 'TRACE_USER_KEPT' => 'The user permission is NO so the old total value is kept.', + 'TRACE_USER_NEVER_TOTAL_NEVER' => 'The user permission is set to NEVER and the total value is set to NEVER, so nothing is changed.', + 'TRACE_USER_NEVER_TOTAL_NO' => 'The user permission is set to NEVER which becomes the total value because it was set to NO.', + 'TRACE_USER_NEVER_TOTAL_YES' => 'The user permission is set to NEVER and overwrites the previous YES.', + 'TRACE_USER_NO_TOTAL_NO' => 'The user permission is NO and the total value was set to NO so it defaults to NEVER.', + 'TRACE_USER_YES_TOTAL_NEVER' => 'The user permission is set to YES but the total NEVER cannot be overwritten.', + 'TRACE_USER_YES_TOTAL_NO' => 'The user permission is set to YES which becomes the total value because it was set to NO.', 'TRACE_USER_YES_TOTAL_YES' => 'The user permission is set to YES and the total value is set to YES, so nothing is changed.', 'TRACE_WHO' => 'Who', 'TRACE_TOTAL' => 'Total', diff --git a/phpBB/language/en/acp/permissions_phpbb.php b/phpBB/language/en/acp/permissions_phpbb.php index 3db436e1ca..b0bc770a74 100644 --- a/phpBB/language/en/acp/permissions_phpbb.php +++ b/phpBB/language/en/acp/permissions_phpbb.php @@ -93,6 +93,7 @@ $lang = array_merge($lang, array( 'acl_u_sig' => array('lang' => 'Can use signature', 'cat' => 'post'), 'acl_u_sendpm' => array('lang' => 'Can send private messages', 'cat' => 'pm'), + 'acl_u_masspm' => array('lang' => 'Can send pm to multiple users and groups', 'cat' => 'pm'), 'acl_u_readpm' => array('lang' => 'Can read private messages', 'cat' => 'pm'), 'acl_u_pm_edit' => array('lang' => 'Can edit own private messages', 'cat' => 'pm'), 'acl_u_pm_delete' => array('lang' => 'Can remove private messages from own folder', 'cat' => 'pm'), diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index cf9bf32c44..e1941b7f8d 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -38,10 +38,14 @@ $lang = array_merge($lang, array( 'BBCODE_EDITED' => 'BBCode edited successfully', 'BBCODE_INVALID_TAG_NAME' => 'The BBCode tag name that you selected is invalid', 'BBCODE_NOT_EXIST' => 'The BBCode you selected does not exist', + 'BBCODE_HELPLINE' => 'Helpline', + 'BBCODE_HELPLINE_EXPLAIN' => 'This field contains the mouseover text of the BBCode', + 'BBCODE_HELPLINE_TEXT' => 'Helpline text', 'BBCODE_TAG' => 'Tag', + 'BBCODE_TAG_TOO_LONG' => 'The tag definition that you have entered is too long, please shorten your tag definition.', 'BBCODE_USAGE' => 'BBCode usage', 'BBCODE_USAGE_EXAMPLE' => '[colour={COLOR}]{TEXT}[/colour]<br /><br />[font={TEXT1}]{TEXT2}[/font]', - 'BBCODE_USAGE_EXPLAIN' => 'Here you define how to use the bbcode. Replace any variable input by the corresponding token (see below)', + 'BBCODE_USAGE_EXPLAIN' => 'Here you define how to use the bbcode. Replace any variable input by the corresponding token (%ssee below%s)', 'EXAMPLE' => 'Example:', 'EXAMPLES' => 'Examples:', @@ -179,7 +183,7 @@ $lang = array_merge($lang, array( 'RANK_ADDED' => 'The rank was successfully added.', 'RANK_IMAGE' => 'Rank Image', - 'RANK_IMAGE_EXPLAIN' => 'Use this to define a small image associated with the rank. The path is relative to the root phpBB2 directory.', + 'RANK_IMAGE_EXPLAIN' => 'Use this to define a small image associated with the rank. The path is relative to the root phpBB directory.', 'RANK_MINIMUM' => 'Minimum Posts', 'RANK_REMOVED' => 'The rank was successfully deleted.', 'RANK_SPECIAL' => 'Set as Special Rank', diff --git a/phpBB/language/en/acp/profile.php b/phpBB/language/en/acp/profile.php index 252ab1c683..e8ab61fea2 100644 --- a/phpBB/language/en/acp/profile.php +++ b/phpBB/language/en/acp/profile.php @@ -44,7 +44,7 @@ $lang = array_merge($lang, array( 'CP_LANG_DEFAULT_VALUE' => 'Default Value', 'CP_LANG_EXPLAIN' => 'Field Description', 'CP_LANG_EXPLAIN_EXPLAIN' => 'The Explanation for this field presented to the user', - 'CP_LANG_NAME' => 'Field Name presented to the user', + 'CP_LANG_NAME' => 'Field Name/Title presented to the user', 'CP_LANG_OPTIONS' => 'Options', 'CREATE_NEW_FIELD' => 'Create New Field', 'COLUMNS' => 'Columns', @@ -53,25 +53,27 @@ $lang = array_merge($lang, array( 'DEFAULT_VALUE' => 'Default Value', 'DELETE_PROFILE_FIELD' => 'Remove profile field', 'DELETE_PROFILE_FIELD_CONFIRM' => 'Are you sure you want to delete this profile field?', - 'DISPLAY_AT_PROFILE' => 'Display at users profile', + 'DISPLAY_AT_PROFILE' => 'Display in user control panel', + 'DISPLAY_AT_PROFILE_EXPLAIN' => 'The user is able to change this profile field within the user control panel.', 'DISPLAY_AT_REGISTER' => 'Display at registration screen', - 'DISPLAY_AT_REGISTER_EXPLAIN' => 'If this option is enabled, the field will be additionally displayed on registration.', + 'DISPLAY_AT_REGISTER_EXPLAIN' => 'If this option is enabled, the field will be displayed on registration and able to be changed within the user control panel.', 'DISPLAY_PROFILE_FIELD' => 'Display profile field', 'DISPLAY_PROFILE_FIELD_EXPLAIN' => 'The profile field will be shown on viewtopic/viewprofile/memberlist/etc.', 'DROPDOWN_ENTRIES_EXPLAIN' => 'Enter your options now, every option in one line', - 'EMPTY_FIELD_IDENT' => 'Empty field name', - 'EMPTY_USER_FIELD_NAME' => 'Empty Field Name presented to the user', - 'ENTRIES' => 'Entries', - 'EVERYTHING_OK' => 'Everything OK', + 'EDIT_DROPDOWN_LANG_EXPLAIN' => 'Please note that you are able to change your options text and also able to add new options to the end. It is not advised to add new options between existing options - this could result in wrong options assigned to your users. This can also happen if you remove options in-between. Removing options from the end result in users having assigned this item now reverting back to the default one.', + 'EMPTY_FIELD_IDENT' => 'Empty field identification', + 'EMPTY_USER_FIELD_NAME' => 'Please enter a field name/title', + 'ENTRIES' => 'Entries', + 'EVERYTHING_OK' => 'Everything OK', 'FIELD_BOOL' => 'Boolean (Yes/No)', 'FIELD_DATE' => 'Date', 'FIELD_DESCRIPTION' => 'Field Description', 'FIELD_DESCRIPTION_EXPLAIN' => 'The Explanation for this field presented to the user', 'FIELD_DROPDOWN' => 'Dropdown Box', - 'FIELD_IDENT' => 'Field Name', - 'FIELD_IDENT_EXPLAIN' => 'The Field Name is a name for you to identify the profile field, it is not displayed to the user.', + 'FIELD_IDENT' => 'Field Identification', + 'FIELD_IDENT_EXPLAIN' => 'The field Identification is a name to identify the profile field within the database and the templates.', 'FIELD_INT' => 'Numbers', 'FIELD_LENGTH' => 'Length of input box', 'FIELD_NOT_FOUND' => 'Profile field not found', @@ -85,7 +87,7 @@ $lang = array_merge($lang, array( 'HIDE_PROFILE_FIELD' => 'Hide Profile Field', 'HIDE_PROFILE_FIELD_EXPLAIN' => 'Only Administrators and Moderators are able to see/fill out this profile field. If this option is enabled, the profile field will be only displayed in user profiles.', - 'INVALID_CHARS_FIELD_IDENT' => 'Field name can only contain lowercase a-z and _', + 'INVALID_CHARS_FIELD_IDENT' => 'Field identification can only contain lowercase a-z and _', 'ISO_LANGUAGE' => 'Language [%s]', 'LANG_SPECIFIC_OPTIONS' => 'Language specific options [<b>%s</b>]', @@ -112,7 +114,7 @@ $lang = array_merge($lang, array( 'RADIO_BUTTONS' => 'Radio Buttons', 'REMOVED_PROFILE_FIELD' => 'Successfully removed profile field.', 'REQUIRED_FIELD' => 'Required Field', - 'REQUIRED_FIELD_EXPLAIN' => 'Force profile field to be filled out or specified by user. This will display the profile field at registration too.', + 'REQUIRED_FIELD_EXPLAIN' => 'Force profile field to be filled out or specified by user. This will display the profile field at registration and within the user control panel.', 'ROWS' => 'Rows', 'SAVE' => 'Save', @@ -134,7 +136,7 @@ $lang = array_merge($lang, array( 'TEXT_DEFAULT_VALUE_EXPLAIN' => 'Enter a default text to be displayed, a default value. Leave empty if you want to show it empty at the first place.', 'UPDATE_PREVIEW' => 'Update Preview', - 'USER_FIELD_NAME' => 'Field Name presented to the user', + 'USER_FIELD_NAME' => 'Field Name/Title presented to the user', 'VISIBILITY_OPTION' => 'Visibility Option', )); diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index 8c102a23f8..abf3685cf0 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -54,6 +54,7 @@ $lang = array_merge($lang, array( 'CACHE_FILENAME' => 'Template file', 'CACHE_FILESIZE' => 'Filesize', 'CACHE_MODIFIED' => 'Modified', + 'CONFIRM_IMAGESET_REFRESH' => 'Are you sure you wish to refresh all imageset data? The settings from the imageset configuration file will overwrite all modifications to the imageset which have been carried out with the imageset editor.', 'CONFIRM_TEMPLATE_CLEAR_CACHE' => 'Are you sure you wish to clear all cached versions of your template files?', 'CONFIRM_TEMPLATE_REFRESH' => 'Are you sure you wish to refresh all template data in the database with the contents of the template files on the filesystem? This will overwrite all modifications which have been carried out with the template editor while the template was stored in the database.', 'CONFIRM_THEME_REFRESH' => 'Are you sure you wish to refresh the theme data stored in the database with the contents of the theme on the filesystem? This will overwrite all modifications which have been carried out with the theme editor while the theme was stored in the database.', @@ -133,85 +134,129 @@ $lang = array_merge($lang, array( 'IMAGESET_EXPORT_EXPLAIN' => 'Here you can export an imageset in the form of an archive. This archive will contain all the data necessary to install the set of images on another board. You may select whether to download the file directly or to place it in your store folder for download later or via FTP.', 'IMAGESET_EXPORTED' => 'Imageset exported succesfully and stored in %s', 'IMAGESET_NAME' => 'Imageset Name', + 'IMAGESET_REFRESHED' => 'Imageset refreshed successfully', 'IMAGESET_UPDATED' => 'Imageset updated successfully', 'ITALIC' => 'Italic', - 'IMG_BTN_POST' => 'New topic', - 'IMG_BTN_REPLY' => 'Reply topic', - 'IMG_BTN_LOCKED' => 'Topic locked', - 'IMG_BTN_POST_PM' => 'New message', - 'IMG_BTN_REPLY_PM' => 'Reply message', - 'IMG_BTN_DELETE' => 'Delete post', - 'IMG_BTN_QUOTE' => 'Quote post', - 'IMG_BTN_PROFILE' => 'Show profile', - 'IMG_BTN_EMAIL' => 'Send email', - 'IMG_BTN_SEARCH' => 'Search posts', - 'IMG_BTN_WWW' => 'Website', - 'IMG_BTN_INFO' => 'Show post details', - 'IMG_BTN_EDIT' => 'Edit post', - 'IMG_BTN_AIM' => 'AIM', - 'IMG_BTN_ICQ' => 'ICQ', - 'IMG_BTN_JABBER' => 'Jabber', - 'IMG_BTN_YIM' => 'YIM', - 'IMG_BTN_MSNM' => 'MSNM', - 'IMG_BTN_ONLINE' => 'User online', - 'IMG_BTN_OFFLINE' => 'User offline', - 'IMG_BTN_REPORT' => 'Report post', - 'IMG_BTN_PM' => 'Send message', - 'IMG_BTN_FRIEND' => 'Add as friend', - 'IMG_BTN_FOE' => 'Add as foe', 'IMG_CAT_BUTTONS' => 'Localised buttons', 'IMG_CAT_CUSTOM' => 'Custom images', 'IMG_CAT_FOLDERS' => 'Topic icons', 'IMG_CAT_FORUMS' => 'Forum icons', 'IMG_CAT_ICONS' => 'General icons', - 'IMG_CAT_KARMA' => 'Karma images', 'IMG_CAT_LOGOS' => 'Logos', 'IMG_CAT_POLLS' => 'Polling images', - 'IMG_FOLDER' => 'Topic', - 'IMG_FOLDER_ANNOUNCE' => 'Announcement', - 'IMG_FOLDER_ANNOUNCE_NEW' => 'Announcement new posts', - 'IMG_FOLDER_ANNOUNCE_POSTED' => 'Announcement posted to', - 'IMG_FOLDER_ANNOUNCE_NEW_POSTED' => 'Announcement posted to new', - 'IMG_FOLDER_GLOBAL' => 'Global', - 'IMG_FOLDER_GLOBAL_NEW' => 'Global new posts', - 'IMG_FOLDER_GLOBAL_POSTED' => 'Global posted to', - 'IMG_FOLDER_GLOBAL_NEW_POSTED' => 'Global posted to new', - 'IMG_FOLDER_HOT' => 'Topic hot', - 'IMG_FOLDER_HOT_NEW' => 'Topic hot new posts', - 'IMG_FOLDER_HOT_POSTED' => 'Topic hot posted to', - 'IMG_FOLDER_HOT_NEW_POSTED' => 'Topic hot posted to new', - 'IMG_FOLDER_LOCKED' => 'Topic locked', - 'IMG_FOLDER_LOCKED_NEW' => 'Topic locked new', - 'IMG_FOLDER_LOCKED_POSTED' => 'Topic locked posted to', - 'IMG_FOLDER_LOCKED_NEW_POSTED' => 'Topic locked posted to new', - 'IMG_FOLDER_NEW' => 'Topic new posts', - 'IMG_FOLDER_NEW_POSTED' => 'Topic posted to new', - 'IMG_FOLDER_POSTED' => 'Topic posted to', - 'IMG_FOLDER_STICKY' => 'Sticky topic', - 'IMG_FOLDER_STICKY_POSTED' => 'Sticky topic posted to', - 'IMG_FOLDER_STICKY_NEW' => 'Sticky topic new posts', - 'IMG_FOLDER_STICKY_NEW_POSTED' => 'Sticky topic posted to new', - 'IMG_FORUM' => 'Forum', - 'IMG_FORUM_NEW' => 'Forum new posts', - 'IMG_FORUM_LOCKED' => 'Forum locked', - 'IMG_FORUM_LINK' => 'Forum link', - 'IMG_ICON_UNAPPROVED' => 'Post unapproved', - 'IMG_ICON_REPORTED' => 'Post reported', - 'IMG_ICON_ATTACH' => 'Attachment', - 'IMG_ICON_POST' => 'Minipost', - 'IMG_ICON_POST_NEW' => 'New minipost', - 'IMG_ICON_POST_LATEST' => 'Last post', - 'IMG_ICON_POST_NEWEST' => 'Newest post', - 'IMG_KARMA_LEFT' => 'Karma left end', - 'IMG_KARMA_CENTER' => 'Karma centre', - 'IMG_KARMA_RIGHT' => 'Karma right end', + 'IMG_CAT_UI' => 'General user interface elements', + 'IMG_CAT_USER' => 'Additional images', + + 'IMG_SITE_LOGO' => 'Main Logo', + 'IMG_UPLOAD_BAR' => 'Upload progress bar', 'IMG_POLL_LEFT' => 'Poll left end', - 'IMG_POLL_RIGHT' => 'Poll right end', 'IMG_POLL_CENTER' => 'Poll centre', - 'IMG_SITE_LOGO' => 'Main Logo', - 'IMG_SUB_FORUM' => 'Subforum', - 'IMG_SUB_FORUM_NEW' => 'Subforum new posts', + 'IMG_POLL_RIGHT' => 'Poll right end', + 'IMG_ICON_FRIEND' => 'Add as friend', + 'IMG_ICON_FOE' => 'Add as foe', + + 'IMG_FORUM_LINK' => 'Forum link', + 'IMG_FORUM_READ' => 'Forum', + 'IMG_FORUM_READ_LOCKED' => 'Forum locked', + 'IMG_FORUM_READ_SUBFORUM' => 'Subforum', + 'IMG_FORUM_UNREAD' => 'Forum new posts', + 'IMG_FORUM_UNREAD_LOCKED' => 'Forum new posts locked', + 'IMG_FORUM_UNREAD_SUBFORUM' => 'Subforum new posts', + + 'IMG_TOPIC_MOVED' => 'Topic moved', + + 'IMG_TOPIC_READ' => 'Topic', + 'IMG_TOPIC_READ_MINE' => 'Topic posted to', + 'IMG_TOPIC_READ_HOT' => 'Topic hot', + 'IMG_TOPIC_READ_HOT_MINE' => 'Topic hot posted to', + 'IMG_TOPIC_READ_LOCKED' => 'Topic locked', + 'IMG_TOPIC_READ_LOCKED_MINE' => 'Topic locked posted to', + + 'IMG_TOPIC_UNREAD' => 'Topic new posts', + 'IMG_TOPIC_UNREAD_MINE' => 'Topic posted to new', + 'IMG_TOPIC_UNREAD_HOT' => 'Topic hot new posts', + 'IMG_TOPIC_UNREAD_HOT_MINE' => 'Topic hot posted to new', + 'IMG_TOPIC_UNREAD_LOCKED' => 'Topic locked new', + 'IMG_TOPIC_UNREAD_LOCKED_MINE' => 'Topic locked posted to new', + + 'IMG_STICKY_READ' => 'Sticky topic', + 'IMG_STICKY_READ_MINE' => 'Sticky topic posted to', + 'IMG_STICKY_READ_LOCKED' => 'Sticky topic locked', + 'IMG_STICKY_READ_LOCKED_MINE' => 'Sticky topic locked posted to', + 'IMG_STICKY_UNREAD' => 'Sticky topic new posts', + 'IMG_STICKY_UNREAD_MINE' => 'Sticky topic posted to new', + 'IMG_STICKY_UNREAD_LOCKED' => 'Sticky topic locked new posts', + 'IMG_STICKY_UNREAD_LOCKED_MINE' => 'Sticky topic locked posted to new', + + 'IMG_ANNOUNCE_READ' => 'Announcement', + 'IMG_ANNOUNCE_READ_MINE' => 'Announcement posted to', + 'IMG_ANNOUNCE_READ_LOCKED' => 'Announcement locked', + 'IMG_ANNOUNCE_READ_LOCKED_MINE' => 'Announcement locked posted to', + 'IMG_ANNOUNCE_UNREAD' => 'Announcement new posts', + 'IMG_ANNOUNCE_UNREAD_MINE' => 'Announcement posted to new', + 'IMG_ANNOUNCE_UNREAD_LOCKED' => 'Announcement locked new posts', + 'IMG_ANNOUNCE_UNREAD_LOCKED_MINE' => 'Announcement locked posted to new', + + 'IMG_GLOBAL_READ' => 'Global', + 'IMG_GLOBAL_READ_MINE' => 'Global posted to', + 'IMG_GLOBAL_READ_LOCKED' => 'Global locked', + 'IMG_GLOBAL_READ_LOCKED_MINE' => 'Global locked posted to', + 'IMG_GLOBAL_UNREAD' => 'Global new posts', + 'IMG_GLOBAL_UNREAD_MINE' => 'Global posted to new', + 'IMG_GLOBAL_UNREAD_LOCKED' => 'Global locked new posts', + 'IMG_GLOBAL_UNREAD_LOCKED_MINE' => 'Global locked posted to new', + + 'IMG_PM_READ' => 'Read private message', + 'IMG_PM_UNREAD' => 'Unread private message', + + 'IMG_ICON_CONTACT_AIM' => 'AIM', + 'IMG_ICON_CONTACT_EMAIL' => 'Send email', + 'IMG_ICON_CONTACT_ICQ' => 'ICQ', + 'IMG_ICON_CONTACT_JABBER' => 'Jabber', + 'IMG_ICON_CONTACT_MSNM' => 'MSNM', + 'IMG_ICON_CONTACT_PM' => 'Send message', + 'IMG_ICON_CONTACT_YAHOO' => 'YIM', + 'IMG_ICON_CONTACT_WWW' => 'Website', + + 'IMG_ICON_POST_DELETE' => 'Delete post', + 'IMG_ICON_POST_EDIT' => 'Edit post', + 'IMG_ICON_POST_INFO' => 'Show post details', + 'IMG_ICON_POST_QUOTE' => 'Quote post', + 'IMG_ICON_POST_REPORT' => 'Report post', + 'IMG_ICON_POST_TARGET' => 'Minipost', + 'IMG_ICON_POST_TARGET_UNREAD' => 'New minipost', + + + 'IMG_ICON_TOPIC_ATTACH' => 'Attachment', + 'IMG_ICON_TOPIC_LATEST' => 'Last post', + 'IMG_ICON_TOPIC_NEWEST' => 'Last unread post', + 'IMG_ICON_TOPIC_REPORTED' => 'Post reported', + 'IMG_ICON_TOPIC_UNAPPROVED' => 'Post unapproved', + + 'IMG_ICON_USER_ONLINE' => 'User online', + 'IMG_ICON_USER_OFFLINE' => 'User offline', + 'IMG_ICON_USER_PROFILE' => 'Show profile', + 'IMG_ICON_USER_SEARCH' => 'Search posts', + 'IMG_ICON_USER_WARN' => 'Warn user', + + 'IMG_BUTTON_PM_FORWARD' => 'Forward private message', + 'IMG_BUTTON_PM_NEW' => 'New private message', + 'IMG_BUTTON_PM_REPLY' => 'Reply private message', + 'IMG_BUTTON_TOPIC_LOCKED' => 'Topic locked', + 'IMG_BUTTON_TOPIC_NEW' => 'New topic', + 'IMG_BUTTON_TOPIC_REPLY' => 'Reply topic', + + 'IMG_USER_ICON1' => 'User defined image 1', + 'IMG_USER_ICON2' => 'User defined image 2', + 'IMG_USER_ICON3' => 'User defined image 3', + 'IMG_USER_ICON4' => 'User defined image 4', + 'IMG_USER_ICON5' => 'User defined image 5', + 'IMG_USER_ICON6' => 'User defined image 6', + 'IMG_USER_ICON7' => 'User defined image 7', + 'IMG_USER_ICON8' => 'User defined image 8', + 'IMG_USER_ICON9' => 'User defined image 9', + 'IMG_USER_ICON10' => 'User defined image 10', 'INCLUDE_DIMENSIONS' => 'Include dimensions', 'INCLUDE_IMAGESET' => 'Include imageset', @@ -245,6 +290,7 @@ $lang = array_merge($lang, array( 'NO_UNINSTALLED_STYLE' => 'No uninstalled styles detected', 'NO_UNINSTALLED_TEMPLATE' => 'No uninstalled templates detected', 'NO_UNINSTALLED_THEME' => 'No uninstalled themes detected', + 'NO_UNIT' => 'None', 'ONLY_IMAGESET' => 'This is the only remaining imageset, you cannot delete it', 'ONLY_STYLE' => 'This is the only remaining style, you cannot delete it', diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php index 5c326810f7..6398ff8f70 100644 --- a/phpBB/language/en/acp/users.php +++ b/phpBB/language/en/acp/users.php @@ -30,12 +30,16 @@ if (empty($lang) || !is_array($lang)) $lang = array_merge($lang, array( 'ADMIN_SIG_PREVIEW' => 'Signature preview', - + 'AT_LEAST_ONE_FOUNDER' => 'You are not able to change this founder to a normal user. There needs to be at least one founder enabled for this board. If you want to change this users founder status promote another user to be a founder first.', + 'BAN_SUCCESSFUL' => 'Ban entered successfully', - 'CANNOT_REMOVE_ANONYMOUS' => 'You are not able to remove the guest user account.', - 'CANNOT_REMOVE_YOURSELF' => 'You are not allowed to remove your own user account.', - 'CONFIRM_EMAIL_EXPLAIN' => 'You only need to specify this if you are changing the users email address.', + 'CANNOT_BAN_YOURSELF' => 'You are not allowed to ban yourself.', + 'CANNOT_DEACTIVATE_YOURSELF' => 'You are not allowed to deactivate your own account.', + 'CANNOT_FORCE_REACT_YOURSELF' => 'You are not allowed to force reactivation of your own account.', + 'CANNOT_REMOVE_ANONYMOUS' => 'You are not able to remove the guest user account.', + 'CANNOT_REMOVE_YOURSELF' => 'You are not allowed to remove your own user account.', + 'CONFIRM_EMAIL_EXPLAIN' => 'You only need to specify this if you are changing the users email address.', 'DELETE_POSTS' => 'Delete posts', 'DELETE_USER' => 'Delete user', 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', diff --git a/phpBB/language/en/email/admin_send_email.txt b/phpBB/language/en/email/admin_send_email.txt index a0da5e28ba..5fd5592f7c 100644 --- a/phpBB/language/en/email/admin_send_email.txt +++ b/phpBB/language/en/email/admin_send_email.txt @@ -10,3 +10,6 @@ Message sent to you follows: ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ {MESSAGE} + + +{EMAIL_SIG} diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 89a0a5ad11..c93ccd78f4 100755 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -32,9 +32,10 @@ $lang = array_merge($lang, array( 'ADMIN_CONFIG' => 'Admin Configuration', 'ADMIN_PASSWORD' => 'Administrator password', 'ADMIN_PASSWORD_CONFIRM' => 'Confirm administrator password', - 'ADMIN_PASSWORD_EXPLAIN' => '(Please enter a password between 6 and 30 characters is length)', + 'ADMIN_PASSWORD_EXPLAIN' => '(Please enter a password between 6 and 30 characters in length)', 'ADMIN_TEST' => 'Check administrator settings', 'ADMIN_USERNAME' => 'Administrator username', + 'ADMIN_USERNAME_EXPLAIN' => '(Please enter a username between 3 and 20 characters in length)', 'APP_MAGICK' => 'Imagemagick support [ Attachments ]', 'AUTHOR_NOTES' => 'Author Notes<br />» %s', 'AVAILABLE' => 'Available', @@ -48,6 +49,7 @@ $lang = array_merge($lang, array( 'CAT_CONVERT' => 'Convert', 'CAT_INSTALL' => 'Install', 'CAT_OVERVIEW' => 'Overview', + 'CHANGE' => 'Change', 'CHECK_TABLE_PREFIX' => 'Please check your table prefix and try again.', 'CLEAN_VERIFY' => 'Cleaning up and verifying the final structure', 'CONFIG_CONVERT' => 'Converting the configuration', @@ -59,10 +61,12 @@ $lang = array_merge($lang, array( 'CONTINUE_LAST' => 'Continue last statements', 'CONVERT' => 'Convert', 'CONVERT_COMPLETE' => 'Conversion completed', + 'CONVERT_COMPLETE_EXPLAIN' => 'You have now successfully converted your board to phpBB 3.0. You can now login and <a href="../">access your forum </a>. Remember that help on using phpBB is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Userguide</a> and the <a href="http://www.phpbb.com/phpBB/viewforum.php?f=46">Beta support forum</a>', 'CONVERT_INTRO' => 'Welcome to the phpBB Unified Convertor Framework', 'CONVERT_INTRO_BODY' => 'From here, you are able to import data from other (installed) forum systems. The list below shows all the conversion modules currently available. If there is no convertor shown in this list for the forum software you wish to convert from, please check our website where further conversion modules may be available for download.', 'CONVERT_NOT_EXIST' => 'The specified convertor does not exist', 'CONVERT_SETTINGS_VERIFIED' => 'The information you entered has been verified. To start the conversion progress, push the button below to begin', + 'COULD_NOT_COPY' => 'Could not copy file <b>%1$s</b> to <b>%2$s</b><br /><br />Please check that the target directory exists and is writable by the webserver', 'COULD_NOT_FIND_PATH' => 'Could not find path to your former forum. Please check your settings and try again.<br />» Specified source path was %s', 'DBMS' => 'Database type', @@ -95,7 +99,7 @@ $lang = array_merge($lang, array( 'DLL_MYSQL4' => 'MySQL 4.x/5.x', 'DLL_MYSQLI' => 'MySQL 4.1.x/5.x with MySQLi Extension', 'DLL_ORACLE' => 'Oracle', - 'DLL_POSTGRES' => 'PostgreSQL 7.x', + 'DLL_POSTGRES' => 'PostgreSQL 7.x/8.x', 'DLL_SQLITE' => 'SQLite', 'DLL_XML' => 'XML support [ Jabber ]', 'DLL_ZLIB' => 'zlib Compression support [ gz, .tar.gz, .zip ]', @@ -116,12 +120,12 @@ $lang = array_merge($lang, array( 'FORUM_ADDRESS' => 'Forum address', 'FORUM_ADDRESS_EXPLAIN' => 'This is the http address of your former forum', 'FORUM_PATH' => 'Forum path', - 'FORUM_PATH_EXPLAIN' => 'This is the relative <strong>to phpBB main directory</strong> server path to your former forum', + 'FORUM_PATH_EXPLAIN' => 'This is the <strong>relative</strong> path on disk to your former forum from the <strong>root of your phpBB install</strong>', 'FOUND' => 'Found', 'FTP_CONFIG' => 'Transfer config by FTP', 'FTP_CONFIG_EXPLAIN' => 'phpBB has detected the presence of the FTP module on this server. You may attempt to install your config.php via this if you wish. You will need to supply the information listed below. Remember your username and password are those to your server! (ask your hosting provider for details if you are unsure what these are)', 'FTP_PATH' => 'FTP Path', - 'FTP_PATH_EXPLAIN' => 'This is the path from your root directory to that of phpBB2, e.g. htdocs/phpBB2/', + 'FTP_PATH_EXPLAIN' => 'This is the path from your root directory to that of phpBB, e.g. htdocs/phpBB3/', 'FTP_UPLOAD' => 'Upload', 'GPL' => 'General Public License', @@ -129,7 +133,7 @@ $lang = array_merge($lang, array( 'INITIAL_CONFIG' => 'Basic Configuration', 'INITIAL_CONFIG_EXPLAIN' => 'Now that install has determined your server can run phpBB you need to supply some specific information. If you do not know how to connect to your database please contact your hosting provider (in the first instance) or use the phpBB support forums. When entering data please ensure you check it thoroughly before continuing.', 'INSTALL_CONGRATS' => 'Congratulations', - 'INSTALL_CONGRATS_EXPLAIN' => 'You have now successfully installed phpBB 3.0. Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the Userguide and the phpBB support forums, see the %sREADME%s for further information.', + 'INSTALL_CONGRATS_EXPLAIN' => 'You have now successfully installed phpBB 3.0. Clicking the button below will take you to your Administration Control Panel (ACP). Take some time to examine the options available to you. Remember that help is available online via the <a href="http://www.phpbb.com/support/documentation/3.0/">Userguide</a> and the <a href="http://www.phpbb.com/phpBB/viewforum.php?f=46">Beta support forum</a>, see the %sREADME%s for further information.', 'INSTALL_INTRO' => 'Welcome to Installation', 'INSTALL_INTRO_BODY' => 'With this option, it is possible to install phpBB onto your server.</p><p>In order to proceed, you will need the following information to hand:</p> <ul> @@ -147,8 +151,13 @@ $lang = array_merge($lang, array( 'INSTALL_SEND_CONFIG' => 'Unfortunately phpBB could not write the configuration information directly to your config.php. This may be because the file does not exist or is not writeable. A number of options will be listed below enabling you to complete installation of config.php.', 'INSTALL_START' => 'Start Install', 'INSTALL_TEST' => 'Test Again', + 'INST_ERR' => 'Installation error', 'INST_ERR_DB_CONNECT' => 'Could not connect to the database, see error message below', + 'INST_ERR_DB_FORUM_PATH' => 'The database file specified is within your forum directory tree. You should put this file in a non web-accessible location', 'INST_ERR_DB_NO_ERROR' => 'No error message given', + 'INST_ERR_DB_NO_MYSQL4' => 'The version of MySQL installed on this machine is incompatible with the "MySQL 4.x/5.x" option you have selected. Please try the "MySQL 3.23.x/4.x" option instead.', + 'INST_ERR_DB_NO_MYSQLI' => 'The version of MySQL installed on this machine is incompatible with the "MySQL 4.1.x/5.x with MySQLi Extension" option you have selected. Please try the "MySQL 4.x/5.x" or "MySQL 3.23.x/4.x" option instead.', + 'INST_ERR_DB_NO_NAME' => 'No database name specified', 'INST_ERR_EMAIL_INVALID' => 'The email address you entered is invalid', 'INST_ERR_EMAIL_MISMATCH' => 'The emails you entered did not match.', 'INST_ERR_FATAL' => 'Fatal installation error', @@ -161,6 +170,9 @@ $lang = array_merge($lang, array( 'INST_ERR_PASSWORD_TOO_LONG' => 'The password you entered is too long. The maximum length is 30 characters.', 'INST_ERR_PASSWORD_TOO_SHORT' => 'The password you entered is too short. The minimum length is 6 characters.', 'INST_ERR_PREFIX' => 'Tables with the specified prefix already exist, please choose an alternative.', + 'INST_ERR_PREFIX_TOO_LONG' => 'The table prefix you have specified is too long. The maximum length is %d characters.', + 'INST_ERR_USER_TOO_LONG' => 'The username you entered is too long. The maximum length is 20 characters.', + 'INST_ERR_USER_TOO_SHORT' => 'The username you entered is too short. The minimum length is 3 characters.', 'INVALID_PRIMARY_KEY' => 'Invalid primary key : %s', 'MAKE_FOLDER_WRITABLE' => 'Please make sure that this folder exists and is writable by the webserver then try again:<br />»<b>%s</b>', @@ -172,10 +184,10 @@ $lang = array_merge($lang, array( 'NOT_UNDERSTAND' => 'Could not understand %s #%d, table %s ("%s")', 'NO_CONVERTORS' => 'No convertors are available for use', 'NO_CONVERT_SPECIFIED' => 'No convertor specified', - 'NO_LOCATION' => 'Cannot determine location', + 'NO_LOCATION' => 'Cannot determine location. If you know Imagemagick is installed, you may specify the location later within your Administration Panel', 'NO_TABLES_FOUND' => 'No tables found.', // TODO: Write some explanatory introduction text - 'OVERVIEW_BODY' => 'Welcome to our first public beta of the next-generation of phpBB after 2.0.x, phpBB 3.0! This beta release is intended for advanced users to try out on dedicated development enviroments to help us finish creating the best Opensource Bulletin Board solution available.</p><p><strong style="text-transform: uppercase;">Note:</strong> This release is <strong style="text-transform: uppercase;">not final</strong> and made available for testing purposes <strong style="text-transform: uppercase;">only</strong>.</p><p>This installation system will guide you through the process of installing phpBB, converting from a different software package or updating to the latest version of phpBB. For more information on each option, select it from the menu above.', + 'OVERVIEW_BODY' => 'Welcome to our public beta of the next-generation of phpBB after 2.0.x, phpBB 3.0! This beta release is intended for advanced users to try out on dedicated development enviroments to help us finish creating the best Opensource Bulletin Board solution available.</p><p><strong style="text-transform: uppercase;">Note:</strong> This release is <strong style="text-transform: uppercase;">not final</strong> and made available for testing purposes <strong style="text-transform: uppercase;">only</strong>.</p><p>This installation system will guide you through the process of installing phpBB, converting from a different software package or updating to the latest version of phpBB. For more information on each option, select it from the menu above.', 'PHP_OPTIONAL_MODULE' => 'Optional Modules', 'PHP_OPTIONAL_MODULE_EXPLAIN' => '<strong>Optional</strong> - These modules or applications are optional, you do not need these to use phpBB 3.0. However if you do have them they will will enable greater functionality.', 'PHP_SUPPORTED_DB' => 'Supported Databases', @@ -198,7 +210,8 @@ $lang = array_merge($lang, array( 'RETRY_WRITE_EXPLAIN' => 'If you wish you can change the permissions on config.php to allow phpBB to write to it. Should you wish to do that you can click Retry below to try again. Remember to return the permissions on config.php after phpBB has finished installation.', 'SCRIPT_PATH' => 'Script path', - 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB2 is located relative to the domain name', + 'SCRIPT_PATH_EXPLAIN' => 'The path where phpBB is located relative to the domain name', + 'SELECT_LANG' => 'Select language', 'SERVER_CONFIG' => 'Server Configuration', 'SOFTWARE' => 'Forum Software', 'SPECIFY_OPTIONS' => 'Specify Conversion Options', @@ -206,6 +219,8 @@ $lang = array_merge($lang, array( 'STAGE_ADVANCED' => 'Advanced Settings', 'STAGE_ADVANCED_EXPLAIN' => 'The settings on this page are only necessary to set if you know that you require something different from the default. If unsure, just proceed to the next page, this can be altered from the Administration Panel later.', 'STAGE_CONFIG_FILE' => 'Configuration File', + 'STAGE_CREATE_TABLE' => 'Create Database Tables', + 'STAGE_CREATE_TABLE_EXPLAIN' => 'The database tables used by phpBB 3.0 have been created and populated with some initial data. Proceed to the next screen to finish installing phpBB.', 'STAGE_DATABASE' => 'Database Settings', 'STAGE_FINAL' => 'Final Stage', 'STAGE_INTRO' => 'Introduction', @@ -219,7 +234,7 @@ $lang = array_merge($lang, array( 'SUB_SUPPORT' => 'Support', 'SUCCESSFUL_CONNECT' => 'Successful Connection', // TODO: Write some text on obtaining support - 'SUPPORT_BODY' => 'During the beta phase a minimal level of support will be given at <a href="http://www.phpbb.com/phpBB/viewforum.php?f=46">the phpBB 3.0 Beta1 support forum</a>. We will provide answers to general setup questions, configuration problems and support for determining common problems mostly related to bugs. We will not support modifications, custom code/style additions or any users using the beta packages within a live environment.</p><p>For additional assistance, please refer to our <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/quick_start_guide.html">Quick Start Guide</a>.</p><p>To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/" target="_new">subscribe to our mailing list</a>', + 'SUPPORT_BODY' => 'During the beta phase a minimal level of support will be given at <a href="http://www.phpbb.com/phpBB/viewforum.php?f=46">the phpBB 3.0 Beta support forum</a>. We will provide answers to general setup questions, configuration problems and support for determining common problems mostly related to bugs. We will not support modifications, custom code/style additions or any users using the beta packages within a live environment.</p><p>For additional assistance, please refer to our <a href="http://www.phpbb.com/support/documentation/3.0/quickstart/">Quick Start Guide</a>.</p><p>To ensure you stay up to date with the latest news and releases, why not <a href="http://www.phpbb.com/support/" target="_new">subscribe to our mailing list</a>', 'SYNC_FORUMS' => 'Starting to sync forums', 'SYNC_TOPICS' => 'Starting to sync topics', 'SYNC_TOPIC_ID' => 'Synchronising topics from topic_id $1%s to $2%s', diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index ad14572737..46c9b90418 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -47,6 +47,7 @@ $lang = array_merge($lang, array( 'CANNOT_MOVE_SAME_FORUM'=> 'You cannot move a topic to the forum it\'s already in', 'CANNOT_WARN_ANONYMOUS' => 'You cannot warn an guest user', + 'CANNOT_WARN_SELF' => 'You cannot warn yourself', 'CAN_LEAVE_BLANK' => 'This can be left blank.', 'CHANGE_POSTER' => 'Change poster', 'CLOSE_REPORT' => 'Close report', @@ -93,8 +94,6 @@ $lang = array_merge($lang, array( 'IP_INFO' => 'IP Information', - 'JUMP_TO' => 'Moderate forum', // Overwriting the jump to language variable for the mcp jumpbox - 'LATEST_LOGS' => 'Latest 5 logged actions', 'LATEST_REPORTED' => 'Latest 5 reports', 'LATEST_UNAPPROVED' => 'Latest 5 posts awaiting for approval', @@ -173,9 +172,6 @@ $lang = array_merge($lang, array( 'MCP_QUEUE_UNAPPROVED_TOPICS' => 'Topics awaiting approval', 'MCP_QUEUE_UNAPPROVED_TOPICS_EXPLAIN' => 'This is a list of all topics which require approving before they will be visible to users', - 'MCP_VIEW_ALL' => 'View all (%s)', - 'MCP_VIEW_LOGS' => 'View logs', - 'MCP_VIEW_RECENT' => 'View recent (%s)', 'MCP_VIEW_USER' => 'View warnings for a specific user', 'MCP_WARN' => 'Warnings', @@ -188,6 +184,7 @@ $lang = array_merge($lang, array( 'MERGE_POSTS_CONFIRM' => 'Are you sure you want to merge the selected posts?', 'MERGE_TOPIC_EXPLAIN' => 'Using the form below you can merge selected posts into another topic. These posts will not be reordered and will appear as if the users posted them to the new topic.<br />Please enter the destination topic id or click on the "Select" button to search for one', 'MERGE_TOPIC_ID' => 'Destination topic id', + 'MODERATE_FORUM' => 'Moderate forum', 'MOD_OPTIONS' => 'Moderator options', 'MORE_INFO' => 'Further information', 'MOST_WARNINGS' => 'Users with most warnings', @@ -200,6 +197,7 @@ $lang = array_merge($lang, array( 'NOTIFY_USER_WARN' => 'Notify user about warning?', 'NOT_MODERATOR' => 'You are not a moderator of this forum', 'NO_DESTINATION_FORUM' => 'Please select a forum for destination', + 'NO_DESTINATION_FORUM_FOUND' => 'There is no destination forum available.', 'NO_ENTRIES' => 'No log entries for this period', 'NO_FEEDBACK' => 'No feedback exists for this user', 'NO_FINAL_TOPIC_SELECTED' => 'You have to select a destination topic for merging posts', @@ -208,6 +206,7 @@ $lang = array_merge($lang, array( 'NO_POST_REPORT' => 'This post was not reported.', 'NO_POST_SELECTED' => 'You must select at least one post to perform this action', 'NO_REASON_DISAPPROVAL' => 'Please give an appropiate reason for disapproval', + 'NO_TOPIC_ICON' => 'None', 'NO_TOPIC_SELECTED' => 'You must select at least one topic to perform this action', 'OTHER_IPS' => 'Other IP addresses this user has posted from', @@ -235,6 +234,8 @@ $lang = array_merge($lang, array( 'READ_WARNINGS' => 'User warnings', 'REPORTER' => 'Reporter', 'REPORTED' => 'Reported', + 'REPORTED_BY' => 'Reported by', + 'REPORTED_ON_DATE' => 'on', 'REPORTS_CLOSED_SUCCESS' => 'The selected reports have been closed successfully.', 'REPORTS_DELETED_SUCCESS' => 'The selected reports have been deleted successfully.', 'REPORTS_TOTAL' => 'In total there are <strong>%d</strong> reports to review', @@ -259,6 +260,7 @@ $lang = array_merge($lang, array( 'RETURN_QUEUE' => '%sReturn to the queue%s', 'RETURN_REPORTS' => '%sReturn to the reports%s', + 'SEARCH_POSTS_BY_USER' => 'Search posts by', 'SELECT_ACTION' => 'Select desired action', 'SELECT_TOPIC' => 'Select topic', 'SELECT_USER' => 'Select user', @@ -324,6 +326,7 @@ $lang = array_merge($lang, array( 'WARNED_USERS_EXPLAIN' => 'This is a list of users with unexpired warnings issued to them', 'WARNING_PM_BODY' => 'The following is a warning which has been issued to you by an administrator or moderator of this site.[quote]%s[/quote]', 'WARNING_PM_SUBJECT' => 'Board Warning Issued', + 'WARNING_POST_DEFAULT' => 'This is a warning regarding the following post made by you: %s', 'WARNINGS_ZERO_TOTAL' => 'No warnings exists', 'YOU_SELECTED_TOPIC' => 'You selected topic number %d: %s', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index b963c0b6e8..37f937edda 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -55,7 +55,7 @@ $lang = array_merge($lang, array( 'EMPTY_SUBJECT_EMAIL' => 'You must specify a subject for the email.', 'EQUAL_TO' => 'Equal to', - 'FIND_USERNAME_EXPLAIN' => 'Use this form to search for specific members. You do not need to fill out all fields. To match partial data use * as a wildcard. When entering dates use the format yyyy-mm-dd, e.g. 2002-01-01. Use the mark checkboxes to select one or more usernames (several usernames may be accepted depending on the form itself). Alternatively you can mark the users required and click the Insert Marked button.', + 'FIND_USERNAME_EXPLAIN' => 'Use this form to search for specific members. You do not need to fill out all fields. To match partial data use * as a wildcard. When entering dates use the format yyyy-mm-dd, e.g. 2002-01-01. Use the mark checkboxes to select one or more usernames (several usernames may be accepted depending on the form itself) and click the Select Marked button to return to the previous form.', 'FLOOD_EMAIL_LIMIT' => 'You cannot send another email at this time. Please try again later.', 'GROUP_LEADER' => 'Group leader', @@ -105,7 +105,7 @@ $lang = array_merge($lang, array( 'REAL_NAME' => 'Recipient name', 'RECIPIENT' => 'Recipient', - 'SEARCH_USER_POSTS' => 'Search users posts', + 'SEARCH_USER_POSTS' => 'Search user\'s posts', 'SELECT_MARKED' => 'Select marked', 'SELECT_SORT_METHOD' => 'Select sort method', 'SEND_IM' => 'Instant messaging', diff --git a/phpBB/language/en/mods/index.htm b/phpBB/language/en/mods/index.htm new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/phpBB/language/en/mods/index.htm diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index dc63fc41ff..30ed20d2f2 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -53,6 +53,7 @@ $lang = array_merge($lang, array( 'BBCODE_S_HELP' => 'Font color: [color=red]text[/color] Tip: you can also use color=#FF0000', 'BBCODE_U_HELP' => 'Underline text: [u]text[/u] (alt+u)', 'BBCODE_W_HELP' => 'Insert URL: [url]http://url[/url] or [url=http://url]URL text[/url] (alt+w)', + 'BBCODE_D_HELP' => 'Flash: [flash=height,width]http://url[/flash] (alt+d)', 'BUMP_ERROR' => 'You cannot bump this topic so soon after the last post.', 'CANNOT_DELETE_REPLIED' => 'Sorry but you may only delete posts which have not been replied to.', @@ -123,6 +124,7 @@ $lang = array_merge($lang, array( 'NO_POLL_TITLE' => 'You have to enter a poll title', 'NO_POST' => 'The requested post does not exist.', 'NO_POST_MODE' => 'No post mode specified', + 'NO_TOPIC_ICON' => 'None', 'PARTIAL_UPLOAD' => 'The uploaded file was only partially uploaded', 'PHP_SIZE_NA' => 'The attachment\'s filesize is too large.<br />Could not determine the maximum size defined by PHP in php.ini.', @@ -180,9 +182,8 @@ $lang = array_merge($lang, array( 'TOO_MANY_USER_OPTIONS' => 'You cannot specify more Options per User than existing poll options', 'TOPIC_BUMPED' => 'Topic has been bumped successfully', - 'UNABLE_GET_IMAGE_SIZE' => 'Accessing the image was impossible or file isn\'t a valid picture.', 'UNAUTHORISED_BBCODE' => 'You cannot use certain bbcodes: ', - 'UNGLOBALISE_EXPLAIN' => 'To switch this topic back from being global to a normal topic, you need to select the forum you whish this topic to be displayed', + 'UNGLOBALISE_EXPLAIN' => 'To switch this topic back from being global to a normal topic, you need to select the forum you wish this topic to be displayed.', 'UPDATE_COMMENT' => 'Update comment', 'URL_INVALID' => 'The URL you specified is invalid.', 'URL_NOT_FOUND' => 'The file specified could not be found.', diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index ac87ec8672..25d0000bb8 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -48,6 +48,8 @@ $lang = array_merge($lang, array( 'NO_SEARCH' => 'Sorry but you are not permitted to use the search system.', 'NO_SEARCH_RESULTS' => 'No suitable matches were found.', 'NO_SEARCH_TIME' => 'Sorry but you cannot use search at this time. Please try again in a few minutes.', + 'WORD_IN_NO_POST' => 'No posts were found because the word %s is not contained in any post.', + 'WORDS_IN_NO_POST' => 'No posts were found because the words %s are not contained in any post.', 'POST_CHARACTERS' => 'characters of posts', @@ -66,7 +68,7 @@ $lang = array_merge($lang, array( 'SEARCH_FORUMS' => 'Search in forums', 'SEARCH_FORUMS_EXPLAIN' => 'Select the forum or forums you wish to search in. For speed all subforums can be searched by selecting the parent and setting enable search subforums below.', 'SEARCH_IN_RESULTS' => 'Search these results', - 'SEARCH_KEYWORDS_EXPLAIN' => 'Place <strong>+</strong> in front of a word which must be found and <strong>-</strong> in front of a word which must not be found. If you place <strong>|</strong> in front of words, each result has to contain at least one of these words. Use * as a wildcard for partial matches', + 'SEARCH_KEYWORDS_EXPLAIN' => 'Place <strong>+</strong> in front of a word which must be found and <strong>-</strong> in front of a word which must not be found. Put a list of words seperated by <strong>|</strong> into brackets if only one of the words must be found. Use * as a wildcard for partial matches.', 'SEARCH_MSG_ONLY' => 'Message text only', 'SEARCH_OPTIONS' => 'Search Options', 'SEARCH_QUERY' => 'Search Query', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index aa9cc1c6cc..679857fabd 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -50,10 +50,20 @@ $lang = array_merge($lang, array( )); $lang = array_merge($lang, array( - 'CAPTCHA_LINE_1' => 'Enter the code on', - 'CAPTCHA_LINE_2' => ' the right which ', - 'CAPTCHA_LINE_3' => 'matches the image', - 'CAPTCHA_LINE_4' => ' on the left ', + 'CAPTCHA' =>array( + 'cells' => array( + 'Enter the code on', + ' the right, in ', + ' the order shown ', + ' on the left ', + ), + 'shape' => array( + 'Enter the code on', + ' the right which ', + 'matches the image', + ' on the left ', + ) + ) )); // Common language entries @@ -149,6 +159,7 @@ $lang = array_merge($lang, array( 'DELETE_MESSAGES_IN_FOLDER' => 'Delete all messages within removed folder', 'DELETE_RULE' => 'Delete rule', 'DELETE_RULE_CONFIRM' => 'Are you sure you want to delete this rule?', + 'DEMOTE_SELECTED' => 'Demote selected', 'DISABLE_CENSORS' => 'Enable word censoring', 'DISPLAY_GALLERY' => 'Display gallery', 'DOWNLOADS' => 'Downloads', @@ -157,6 +168,7 @@ $lang = array_merge($lang, array( 'DRAFT_UPDATED' => 'Draft successfully updated.', 'EDIT_DRAFT_EXPLAIN' => 'Here you are able to edit your draft. Drafts do not contain attachment and poll informations.', + 'EMAIL_BANNED_EMAIL' => 'The email address you entered is not allowed to be used.', 'EMAIL_INVALID_EMAIL' => 'The email address you entered is invalid.', 'EMAIL_REMIND' => 'This must be the email address you supplied when registering.', 'EMAIL_TAKEN_EMAIL' => 'The entered email address is already in use', @@ -212,6 +224,9 @@ $lang = array_merge($lang, array( 'IF_FOLDER_FULL' => 'If folder is full', 'IMPORTANT_NEWS' => 'Important announcements', + 'ITEMS_REQUIRED' => 'The items marked with * are required profile fields and need to be filled out', + + 'JOIN_SELECTED' => 'Join selected', 'LANGUAGE' => 'Language', 'LINK_REMOTE_AVATAR' => 'Link off-site', @@ -225,11 +240,14 @@ $lang = array_merge($lang, array( 'MARK_IMPORTANT' => 'Mark as important', 'MARKED_MESSAGE' => 'Marked message', 'MAX_FOLDER_REACHED' => 'Maximum number of allowed user defined folder reached', + 'MESSAGE_BY_AUTHOR' => 'by', 'MESSAGE_COLOURS' => 'Message colours', 'MESSAGE_DELETED' => 'Message successfully deleted', 'MESSAGE_HISTORY' => 'Message history', 'MESSAGE_REMOVED_FROM_OUTBOX' => 'This message has been removed by it\'s author before it was delivered', - 'MESSAGE_STORED' => 'The message has been send successfully', + 'MESSAGE_SENT_ON' => 'on', + 'MESSAGE_STORED' => 'Your message has been sent successfully', + 'MESSAGE_TO' => 'To', 'MESSAGES_DELETED' => 'Messages successfully deleted', 'MOVE_DELETED_MESSAGES_TO' => 'Move messages from removed folder to', 'MOVE_DOWN' => 'Move down', @@ -249,14 +267,20 @@ $lang = array_merge($lang, array( 'NOTIFY_METHOD_EXPLAIN' => 'Method for sending messages sent via this board.', 'NOTIFY_METHOD_IM' => 'Jabber only', 'NOTIFY_ON_PM' => 'Email me on new private messages', - 'NOT_ADDED_FRIENDS' => 'You cannot add the anonymous user to your friends list.', - 'NOT_ADDED_FOES' => 'Usernames not added to foes list because of administrator/moderator status or because you tried to add the anonymous user.', + 'NOT_ADDED_FRIENDS_ANONYMOUS' => 'You cannot add the anonymous user to your friends list.', + 'NOT_ADDED_FRIENDS_FOES' => 'You cannot add users to your friends list who are on your foes list', + 'NOT_ADDED_FRIENDS_SELF' => 'You cannot add yourself to the friends list', + 'NOT_ADDED_FOES_MOD_ADMIN' => 'You cannot add administrators and moderators to your foes list.', + 'NOT_ADDED_FOES_ANONYMOUS' => 'You cannot add the anonymous user to your foes list.', + 'NOT_ADDED_FOES_FRIENDS' => 'You cannot add users to your foes list who are on your friends list.', + 'NOT_ADDED_FOES_SELF' => 'You cannot add yourself to the foes list.', 'NOT_AGREE' => 'I do not agree to these terms', 'NOT_ENOUGH_SPACE_FOLDER' => 'The destination folder "%s" seems to be full. The requested action has not been taken.', 'NOT_MOVED_MESSAGE' => 'You have 1 private message currently on hold because of full folder.', 'NOT_MOVED_MESSAGES' => 'You have %d private messages currently on hold because of full folder.', 'NO_ACTION_MODE' => 'No message action specified', 'NO_AUTHOR' => 'No author defined for this message', + 'NO_AVATAR_CATEGORY' => 'None', 'NO_AUTH_DELETE_MESSAGE' => 'You are not authorised to delete private messages.', 'NO_AUTH_EDIT_MESSAGE' => 'You are not authorised to edit private messages.', @@ -267,6 +291,7 @@ $lang = array_merge($lang, array( 'NO_AUTH_SEND_MESSAGE' => 'You are not authorised sending private messages.', 'NO_AUTH_SIGNATURE' => 'You are not authorised to define a signature', + 'NO_BCC_RECIPIENT' => 'None', 'NO_BOOKMARKS' => 'You have no bookmarks', 'NO_BOOKMARKS_SELECTED' => 'You have selected no bookmarks', 'NO_EMAIL_USER' => 'The email/username information submitted could not be found', @@ -283,6 +308,7 @@ $lang = array_merge($lang, array( 'NO_RECIPIENT' => 'No recipient defined', 'NO_RULES_DEFINED' => 'No rules defined', 'NO_SAVED_DRAFTS' => 'No drafts saved', + 'NO_TO_RECIPIENT' => 'None', 'NO_WATCHED_FORUMS' => 'You are not watching any forums.', 'NO_WATCHED_TOPICS' => 'You are not watching any topics.', @@ -295,7 +321,7 @@ $lang = array_merge($lang, array( 'PM_ICON' => 'PM icon', 'PM_INBOX' => 'Inbox', 'PM_OUTBOX' => 'Outbox', - 'PM_SENTBOX' => 'Sentbox', + 'PM_SENTBOX' => 'Sent Messages', 'PM_SUBJECT' => 'Message subject', 'PM_TO' => 'Send to', 'POPUP_ON_PM' => 'Pop up window on new private message', @@ -325,6 +351,7 @@ $lang = array_merge($lang, array( 'RENAME' => 'Rename', 'RENAME_FOLDER' => 'Rename folder', 'REPLIED_MESSAGE' => 'Replied to message', + 'RESIGN_SELECTED' => 'Resign selected', 'RETURN_FOLDER' => '%1$sReturn to previous folder%2$s', 'RETURN_UCP' => '%sReturn to the User Control Panel%s', 'RULE_ADDED' => 'Rule successfully added', @@ -372,7 +399,7 @@ $lang = array_merge($lang, array( 'UCP_MSNM' => 'MSN Messenger', 'UCP_NO_ATTACHMENTS' => 'You have posted no files', - 'UCP_PREFS' => 'Preferences', + 'UCP_PREFS' => 'Forum preferences', 'UCP_PREFS_PERSONAL' => 'Personal settings', 'UCP_PREFS_POST' => 'Posting messages', 'UCP_PREFS_VIEW' => 'Viewing posts', @@ -399,7 +426,6 @@ $lang = array_merge($lang, array( 'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.', 'UCP_REMIND' => 'Send password', 'UCP_RESEND' => 'Send activation email', - 'UCP_WATCHED' => 'Watched items', 'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.', 'UCP_YIM' => 'Yahoo Messenger', 'UCP_ZEBRA' => 'Friends and Foes', @@ -414,7 +440,7 @@ $lang = array_merge($lang, array( 'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.', 'USERNAME_CHARS_ANY_EXPLAIN' => 'Length must be between %1$d and %2$d characters.', 'USERNAME_TAKEN_USERNAME' => 'The username you entered is already in use, please select an alternative.', - 'USERNAME_USERNAME_DISALLOWED' => 'The username you entered has been banned.', + 'USERNAME_DISALLOWED_USERNAME' => 'The username you entered has been banned.', 'USER_NOT_FOUND_OR_INACTIVE' => 'The usernames you specified could either not be found or are not activated users.', 'VIEW_AVATARS' => 'Display avatars', @@ -476,7 +502,6 @@ $lang = array_merge($lang, array( 'IS_GROUP' => 'is in usergroup', 'ANSWERED' => 'answered', 'FORWARDED' => 'forwarded', - 'REPORTED' => 'reported', 'TO_GROUP' => 'to my default usergroup', 'TO_ME' => 'to me' ), @@ -493,11 +518,6 @@ $lang = array_merge($lang, array( 'NO_MEMBER' => 'No group memberships', 'NO_PENDING' => 'No pending memberships', 'NO_NONMEMBER' => 'No non-member groups', - - 'QUIT_ALL' => 'Quit all', - 'QUIT_MARKED' => 'Quit marked', - 'JOIN_ALL' => 'Join all', - 'JOIN_MARKED' => 'Join marked', )); ?>
\ No newline at end of file diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index 782b3a7292..0c50afb689 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -73,7 +73,7 @@ $lang = array_merge($lang, array( 'POLL_RUN_TILL' => 'Poll runs till %s', 'POLL_VOTED_OPTION' => 'You voted for this option', - 'POST_ENCODING' => 'This post by <strong>%1$s</strong> was made in a character set different to yours. To view this post in its proper encoding click %2$sHERE%3$s.', + 'POST_ENCODING' => 'This post by <strong>%1$s</strong> was made in a character set different to yours. %2$sView this post in its proper encoding%3$s.', 'PRINT_TOPIC' => 'Print view', 'QUICK_MOD' => 'Quick-mod tools', |