Various lang updates

git-svn-id: file:///svn/phpbb/trunk@4718 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/language/en/lang_admin.php

@@ -642,13 +642,14 @@ $lang += array(
 	'LIMIT_LOAD_EXPLAIN'		=> 'If the 1 minute system load exceeds this value the board will go offline, 1.0 equals ~100% utilisation of one processor. This only functions on UNIX based servers.',
 	'LIMIT_SESSIONS'			=> 'Limit sessions',
 	'LIMIT_SESSIONS_EXPLAIN'	=> 'If the number of sessions exceeds this value within a one minute period the board will go offline. Set to 0 for unlimited sessions.',
-	'SESSION_LENGTH'			=> 'Session length [ seconds ]', 
+	'SESSION_LENGTH'			=> 'Session length', 
+	'SESSION_LENGTH_EXPLAIN'	=> 'Sessions will expire after this time, in seconds.', 
 	'YES_POST_MARKING'			=> 'Enable dotted topics', 
 	'YES_POST_MARKING_EXPLAIN'	=> 'Indicates whether user has posted to a topic.', 
 	'YES_READ_MARKING'			=> 'Enable server-side topic marking', 
 	'YES_READ_MARKING_EXPLAIN'	=> 'Stores read/unread status information in the database rather than a cookie.', 
-	'VIEW_ONLINE_TIME'			=> 'View online time span [ minutes ]', 
+	'ONLINE_LENGTH'				=> 'View online time span', 
-	'VIEW_ONLINE_TIME_EXPLAIN'	=> 'How long before users drop out of the viewonline listings, lower equals less processing.', 
+	'ONLINE_LENGTH_EXPLAIN'		=> 'Time in minutes after which inactive users will not appear in viewonline listings, lower equals less processing.', 
 	'YES_ONLINE'				=> 'Enable online user listings', 
 	'YES_ONLINE_EXPLAIN'		=> 'Display online user information on index, forum and topic pages.', 
 	'YES_ONLINE_TRACK'			=> 'Enable display of user online img', 
@@ -703,8 +704,8 @@ $lang += array(
 	'BOARD_SETTINGS_EXPLAIN'	=> 'Here you can determine the basic operation of your board, from the site name through user registration to private messaging.',
 	'SITE_NAME'					=> 'Site name',
 	'SITE_DESC'					=> 'Site description',
-	'BOARD_DISABLE'				=> 'Disable board',
+	'DISABLE_BOARD'				=> 'Disable board',
-	'BOARD_DISABLE_EXPLAIN'		=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
+	'DISABLE_BOARD_EXPLAIN'		=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
 	'ACC_ACTIVATION'			=> 'Account activation',
 	'ACC_ACTIVATION_EXPLAIN'	=> 'This determines whether users have immediate access to the board or if confirmation is required. You can also completely disable new registrations.',
 	'ACC_NONE'					=> 'None',
@@ -759,13 +760,13 @@ $lang += array(
 
 // Board defaults
 $lang += array(
-	'BOARD_DEFAULTS_EXPLAIN'	=> 'These settings allow you to define a number of default or global settings used by the board. For example, to disable the use of HTML across the entire board alter the relevant setting below. This data is also used for new user registrations and (where relevant) guest users.',
+	'BOARD_DEFAULTS_EXPLAIN'	=> 'These settings allow you to define a number of default or global settings used by the board. For example, to disable the use of HTML across the entire board alter the relevant setting below. This data is also used for new user registrations and (where relevant) guest users. Please note that registered users can override some of these options with their own settings.',
 	'DEFAULT_STYLE'				=> 'Default Style',
 	'OVERRIDE_STYLE'			=> 'Override user style',
 	'OVERRIDE_STYLE_EXPLAIN'	=> 'Replaces users style with the default.',
 	'DEFAULT_LANGUAGE'			=> 'Default Language',
-	'DATE_FORMAT'				=> 'Date Format',
+	'DEFAULT_DATE_FORMAT'		=> 'Date Format',
-	'DATE_FORMAT_EXPLAIN'		=> 'The date format is the same as the PHP date function.',
+	'DEFAULT_DATE_FORMAT_EXPLAIN'=> 'The date format is the same as the PHP date function.',
 	'SYSTEM_TIMEZONE'			=> 'System Timezone',
 	'SYSTEM_DST'				=> 'Enable Daylight Savings Time',
 	'CHAR_LIMIT'				=> 'Max characters per post',
@@ -783,6 +784,12 @@ $lang += array(
 	'USERNAME_CHARS_EXPLAIN'	=> 'Restrict type of characters that may be used in usernames, spacers are; space, -, +, _, [ and ]', 
 	'PASSWORD_LENGTH'			=> 'Password length', 
 	'PASSWORD_LENGTH_EXPLAIN'	=> 'Minimum and maximum number of characters in passwords.', 
+	'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_ANY'				=> 'No requirements', 
+	'PASS_TYPE_CASE'			=> 'Must be mixed case', 
+	'PASS_TYPE_ALPHA'			=> 'Must contain alphanumerics', 
+	'PASS_TYPE_SYMBOL'			=> 'Must contain symbols', 
 	'MIN_CHARS'					=> 'Min', 
 	'MAX_CHARS'					=> 'Max', 
 	'MIN_RATINGS'				=> 'Ratings count before karma',
@@ -824,7 +831,6 @@ $lang += array(
 // Avatars
 $lang += array(
 	'AVATARS_GALLERY'	=> 'Avatar Gallery', 
-	'AVATARS_PERSONAL'	=> 'Personal Avatars', 
 );
 
 // PHP info
@@ -868,7 +874,11 @@ $lang += array(
 	'FORUM_PARENT'		=> 'Parent Forum',
 	'NO_PARENT'			=> 'No Parent',
 	'LOCKED'			=> 'Locked',
-	'UNLOCKED'			=> 'Unlocked',
+	'UNLOCKED'			=> 'Unlocked', 
+	'ENABLE_NEWS'		=> 'Set as news forum', 
+	'ENABLE_NEWS_EXPLAIN' => 'If set to yes posts in this forum will be displayed as news items.',
+	'ENABLE_RECENT'		=> 'Enable recent posts', 
+	'ENABLE_RECENT_EXPLAIN' => 'If set to yes topics made to this forum will be shown in the recent posts list.', 
 	'ENABLE_INDEXING'	=> 'Enable search indexing', 
 	'ENABLE_INDEXING_EXPLAIN'	=> 'If set to yes posts made to this forum will be indexed for searching.', 
 	'ENABLE_TOPIC_ICONS'=> 'Enable Topic Icons', 
@@ -917,32 +927,32 @@ $lang += array(
 	'EXPORT_SMILE'	=> 'Create smilies pak',
 	'IMPORT_ICONS'	=> 'Install icons pak',
 	'EXPORT_ICONS'	=> 'Create icons pak',
-	'ADD_SMILE'		=> 'Add smilies',
+	'MASS_ADD_SMILE'=> 'Add multiple smilies',
-	'ADD_ICONS'		=> 'Add icons',
+	'ADD_SMILE'		=> 'Add single smilie',
+	'ADD_ICONS'		=> 'Add single icon',
+	'ADD_ICONS'		=> 'Add multiple icons',
 	'EDIT_SMILE'	=> 'Edit smilies',
 	'EDIT_ICONS'	=> 'Edit Icons',
 	'SMILE_NOT_DISPLAYED' => 'The following smilies are not displayed on the posting page',
 	'ICONS_NOT_DISPLAYED' => 'The following icons are not displayed on the posting page',
 	'EMOTION'		=> 'Emotion',
 	'REORDER'		=> 'Reorder',
-	'DISPLAY_ON_POSTING' => 'Display on posting',
+	'DISPLAY'		=> 'Display',
+	'DIMENSIONS'	=> 'Dimensions',
 	'FIRST'			=> 'First',
 	'AFTER_SMILE'	=> 'After %s',
 	'AFTER_ICONS'	=> 'After %s',
 	'SMILE_CONFIG'	=> 'Smilie configuration',
+	'SMILE_IMAGE'	=> 'Smilie image', 
 	'SMILE_CODE'	=> 'Smilie code',
 	'SMILE_URL'		=> 'Smilie image file',
-	'SMILE_HEIGHT'	=> 'Smilie height',
-	'SMILE_WIDTH'	=> 'Smilie width',
 	'SMILE_ORDER'	=> 'Smilie order',
 	'SMILE_EMOTION' => 'Emotion',
 	'SMILE_ADD'		=> 'Add a new Smilie',
 	'SMILE_EDIT'	=> 'Edit Smilie',
 	'SMILE_LOCATION'=> 'Smilie location',
 	'ICONS_CONFIG'	=> 'Icon configuration',
-	'ICONS_URL'		=> 'Icon image file',
+	'ICONS_IMAGE'	=> 'Icon image', 
-	'ICONS_HEIGHT'	=> 'Icon height',
-	'ICONS_WIDTH'	=> 'Icon width',
 	'ICONS_ORDER'	=> 'Icon order',
 	'ICONS_LOCATION'=> 'Icon location',
 	'ICONS_ADD'		=> 'Add a new Icon',
@@ -1333,6 +1343,18 @@ $lang += array(
 	'HIDE_RAW_CSS'			=> 'Hide CSS', 
 	'SHOW_RAW_CSS_NOTE'		=> 'Note', 
 	'SHOW_RAW_CSS_EXPLAIN'	=> 'Enter each element on a new line, ending with a ; Expand the data for each element, e.g. do not use font: use font-family:, font-weight:, etc.', 
+	'CSS_CAT_LAYOUT'	=> 'Layout', 
+	'CSS_#HEADER'		=> 'Header', 
+	'CSS_#LOGO'			=> 'Header logo', 
+	'CSS_#LOGOTEXT'		=> 'Header description', 
+	'CSS_#MENU'			=> 'Menu container', 
+	'CSS_#MENULEFT'		=> 'Left hand menu', 
+	'CSS_#MENURIGHT'	=> 'Right hand menu',
+	'CSS_#INFO'			=> 'Info container', 
+	'CSS_#INFOLEFT'		=> 'Left hand info', 
+	'CSS_#INFORIGHT'	=> 'Right hand info',
+	'CSS_#MAINTABLE'	=> 'Main table', 
+	'CSS_#FOOTER'		=> 'Footer', 
 	'CSS_CAT_TEXT'		=> 'Text Classes', 
 	'CSS_BODY'			=> 'Body',
 	'CSS_P'				=> 'Paragraph', 
@@ -1703,11 +1725,11 @@ $lang += array(
 	'ADMIN_UPLOAD_ERROR'		=> 'Errors while trying to attach file: %s',
 
 	'SECURE_DOWNLOADS'				=> 'Enable secure downloads',
-	'SECURE_DOWNLOADS_EXPLAIN'		=> 'With this option enabled, downloads are limited to ip\'s/hostnames you defined.',
+	'SECURE_DOWNLOADS_EXPLAIN'		=> 'With this option enabled, downloads are limited to IP\'s/hostnames you defined.',
-	'SECURE_ALLOW_DENY'				=> 'Allow/Deny Order',
+	'SECURE_ALLOW_DENY'				=> 'Allow/Deny List',
-	'SECURE_ALLOW_DENY_EXPLAIN'		=> 'This setting only applies to downloading files',
+	'SECURE_ALLOW_DENY_EXPLAIN'		=> 'Allow or Deny the list of addresses, this setting only applies to downloading files',
-	'ORDER_ALLOW_DENY'				=> 'Allow listed IPs, deny all others',
+	'ORDER_ALLOW_DENY'				=> 'Allow',
-	'ORDER_DENY_ALLOW'				=> 'Deny listed IPs, allow all others',
+	'ORDER_DENY_ALLOW'				=> 'Deny',
 	'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?',
 
@@ -1842,7 +1864,7 @@ $lang += array(
 $lang += array(
 	'BOTS_EXPLAIN'	=> 'Bots or crawlers are automated agents most commonly used by search engines to update their databases. Since they rarely make proper use of sessions they can distort visitor counts, increase load and sometimes fail to index sites correctly. Here you can define a special type of user to overcome these problems.',
 	
-	'BOT_NAME'			=> 'Bot name', 
+	'BOT_NAME'			=> 'Bot name',
 	'BOT_LAST_VISIT'	=> 'Last visit', 
 	'BOT_NEVER'			=> 'Never', 
 	'BOT_ACTIVATE'		=> 'Activate', 
@@ -1851,12 +1873,13 @@ $lang += array(
 
 	'BOT_EDIT'			=> 'Edit bots', 
 	'BOT_EDIT_EXPLAIN'	=> 'Here you can add or edit an existing bot entry. You may define an agent string and/or one or more IP addresses (or range of addresses) to match. Be careful when defining matching agent strings or addresses. You may also specify a style and language that the bot will view the board using. This may allow you to reduce bandwidth use by setting a simple style for bots. Remember to set appropriate permissions for the special Bot usergroup.', 
-	'BOT_NAME'			=> 'Bot name',
 	'BOT_NAME_EXPLAIN'	=> 'Used only for your own information.',
 	'BOT_LANG'			=> 'Bot language', 
-	'BOT_LANG_EXPLAIN'	=> 'The language presented to the bot as it browses', 
+	'BOT_LANG_EXPLAIN'	=> 'The language presented to the bot as it browses.', 
 	'BOT_STYLE'			=> 'Bot style', 
-	'BOT_STYLE_EXPLAIN'	=> 'The style used for the board by the bot', 
+	'BOT_STYLE_EXPLAIN'	=> 'The style used for the board by the bot.', 
+	'BOT_VIS'			=> 'Bot visible', 
+	'BOT_VIS_EXPLAIN'	=> 'Allow bot to be seen by all users in online lists.', 
 	'BOT_ACTIVE'		=> 'Bot active', 
 	'BOT_AGENT'			=> 'Agent match', 
 	'BOT_AGENT_EXPLAIN'	=> 'A string matching the bots browser agent, partial matches are allowed.', 

phpBB/language/en/lang_main.php

@@ -257,8 +257,15 @@ $lang = array(
 	'NEW_POSTS_LOCKED'	=> 'New posts [ Locked ]',
 	'FORUM_LOCKED'		=> 'Forum Locked', 
 
-	'YOU_LAST_VISIT'	=> 'You last visited on %s',
+	'YOU_LAST_VISIT'	=> 'Last visit on %s',
-	'CURRENT_TIME'		=> 'The time now is %s',
+	'CURRENT_TIME'		=> 'The time is %s',
+
+	'SEARCH_NEW'		=> 'View new posts',
+	'SEARCH_SELF'		=> 'View your posts',
+	'SEARCH_UNANSWERED' => 'View unanswered posts',
+	
+	'MARK_FORUMS_READ'	=> 'Mark Forums Read',
+	'FORUMS_MARKED'		=> 'All forums have been marked read',
 
 	'LOGIN'			=> 'Login', 
 	'LOGOUT_USER'	=> 'Logout [ %s ]', 
@@ -273,15 +280,12 @@ $lang = array(
 	'LAST_POST'		=> 'Last Post',
 	'MODERATOR'		=> 'Moderator',
 	'MODERATORS'	=> 'Moderators',
-	'New_pms'		=> '<b>%d</b> new messages',
+	'NEW_PMS'		=> '<b>%d</b> new messages',
-	'New_pm'		=> '<b>%d</b> new message',
+	'NEW_PM'		=> '<b>%d</b> new message',
-	'No_new_pm'		=> '<b>0</b> new messages',
+	'NO_NEW_PM'		=> '<b>0</b> new messages',
-	'Unread_pms'	=> '<b>%d</b> unread messages',
+	'UNREAD_PMS'	=> '<b>%d</b> unread messages',
-	'Unread_pm'		=> '<b>%d</b> unread message',
+	'UNREAD_PM'		=> '<b>%d</b> unread message',
-	'No_unread_pm'	=> '<b>0</b> unread messages',
+	'NO_UNREAD_PM'	=> '<b>0</b> unread messages',
-	'You_new_pm'	=> 'A new private message is waiting for you in your Inbox',
-	'You_new_pms'	=> 'New private messages are waiting for you in your Inbox',
-	'You_no_new_pm' => 'No new private messages are waiting for you',
 
 	'LEGEND'				=> 'Legend', 
 	'REGISTERED_USERS'		=> 'Registered Users:',
@@ -289,8 +293,8 @@ $lang = array(
 	'BROWSING_FORUM_GUESTS'	=> 'Users browsing this forum: %1$s and %2$d guests',
 
 	'GUEST' => 'Guest',
-	'ACP' => 'Administration Control Panel',
+	'ACP'	=> 'Administration Control Panel',
-	'MCP' => 'Moderator Control Panel',
+	'MCP'	=> 'Moderator Control Panel',
 
 	'LOGIN_FORUM'	=> 'To view or post in this forum you must enter a password.', 
 	'WRONG_PASSWORD'=> 'You entered an incorrect password.', 
@@ -314,13 +318,7 @@ $lang = array(
 	'REDIRECTS'		=> 'Total redirects', 
 	'WHO_IS_ONLINE'	=> 'Who is Online',
 	'BIRTHDAYS'		=> 'Birthdays', 
-
+	'STATISTICS'	=> 'Statistics', 
-	'SEARCH_NEW'		=> 'View posts since last visit',
-	'SEARCH_SELF'		=> 'View your posts',
-	'SEARCH_UNANSWERED' => 'View unanswered posts',
-	
-	'MARK_FORUMS_READ'	=> 'Mark Forums Read',
-	'FORUMS_MARKED'		=> 'All forums have been marked read',
 
 	'CONGRATULATIONS'	=> 'Congratulations to', 
 	'NO_BIRTHDAYS'		=> 'No birthdays today', 
@@ -343,9 +341,9 @@ $lang = array(
 	'TOTAL_POSTS_OTHER'		=> 'Total posts <b>%d</b>',
 	'TOTAL_TOPICS_ZERO'		=> 'Total topics <b>0</b>',
 	'TOTAL_TOPICS_OTHER'	=> 'Total topics <b>%d</b>',
-	'TOTAL_USERS_ZERO'		=> 'Total users <b>0</b>',
+	'TOTAL_USERS_ZERO'		=> 'Total members <b>0</b>',
-	'TOTAL_USERS_OTHER'		=> 'Total users <b>%d</b>',
+	'TOTAL_USERS_OTHER'		=> 'Total members <b>%d</b>',
-	'NEWEST_USER'			=> 'Newest user <b>%s%s%s</b>',
+	'NEWEST_USER'			=> 'Our newest member <b>%s%s%s</b>',
 
 
 	'POST_STICKY' 		=> 'Sticky',
@@ -427,6 +425,7 @@ $lang = array(
 	'NOT_WATCHING_FORUM'	=> 'You no subscribe to updates on this forum',
 	'ARE_WATCHING_FORUM'	=> 'You have subscribed to receive updates on this forum',
 
+	'TOTAL_ATTACHMENTS'	=> '%d Attachments', 
 	'VIEW_FORUM_TOPIC'	=> '1 Topic',
 	'VIEW_FORUM_TOPICS'	=> '%d Topics',
 );
@@ -474,9 +473,10 @@ $lang += array(
 	'POST_REPORTED'		=> 'Click to view reports',
 	'POST_UNAPPROVED'	=> 'Click to approve post',
 
-	'WROTE'	=> 'wrote',
+	'WROTE'			=> 'wrote',
-	'QUOTE'	=> 'Quote',
+	'QUOTE'			=> 'Quote',
-	'CODE'	=> 'Code',
+	'CODE'			=> 'Code',
+	'ATTACHMENTS'	=> 'Attachments', 
 
 	'QUICK_MOD'			=>	'Quick-mod tools',
 	'LOCK_TOPIC'		=>	'Lock Topic',
@@ -956,6 +956,10 @@ $lang += array(
 // ucp_pm
 $lang += array(
 	'Private_Messaging' => 'Private Messaging',
+	'YOU_NEW_PM'		=> 'A new private message is waiting for you in your Inbox',
+	'YOU_NEW_PMS'		=> 'New private messages are waiting for you in your Inbox',
+	'YOU_NO_NEW_PM'		=> 'No new private messages are waiting for you',
+
 	'Unread_message' => 'Unread message',
 	'Read_message' => 'Read message',
 	'Read_pm' => 'Read message',