6 files changed, 45 insertions, 35 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 52389d85b9..8b12a926b0 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -50,7 +50,8 @@ $lang = array_merge($lang, array(
 	'SITE_DESC'						=> 'Site description',
 	'SITE_NAME'						=> 'Site name',
 	'SYSTEM_DST'					=> 'Enable Summer Time/<abbr title="Daylight Saving Time">DST</abbr>',
-	'SYSTEM_TIMEZONE'				=> 'System timezone',
+	'SYSTEM_TIMEZONE'				=> 'Guest timezone',
+	'SYSTEM_TIMEZONE_EXPLAIN'			=> 'Timezone to use for displaying times to users who are not logged in (guests, bots). Logged in users set their timezone during registration and can change it in user control panel.',
 	'WARNINGS_EXPIRE'				=> 'Warning duration',
 	'WARNINGS_EXPIRE_EXPLAIN'		=> 'Number of days that will elapse before the warning will automatically expire from a user’s record.',
 ));
@@ -359,7 +360,7 @@ $lang = array_merge($lang, array(
 	'RECOMPILE_STYLES'				=> 'Recompile stale style components',
 	'RECOMPILE_STYLES_EXPLAIN'		=> 'Check for updated style components 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_ANON_READ_MARKING_EXPLAIN'	=> 'Stores read/unread status information for guests. If disabled, posts are always marked read for guests.',
 	'YES_BIRTHDAYS'					=> 'Enable birthday listing',
 	'YES_BIRTHDAYS_EXPLAIN'			=> 'If disabled the birthday listing is no longer displayed. To let this setting take effect the birthday feature needs to be enabled too.',
 	'YES_JUMPBOX'					=> 'Enable display of jumpbox',
@@ -392,7 +393,7 @@ $lang = array_merge($lang, array(
 	'LDAP_NO_EMAIL'					=> 'The specified e-mail attribute does not exist.',
 	'LDAP_NO_IDENTITY'				=> 'Could not find a login identity for %s.',
 	'LDAP_PASSWORD'					=> 'LDAP password',
-	'LDAP_PASSWORD_EXPLAIN'			=> 'Leave blank to use anonymous binding. Else fill in the password for the above user. Required for Active Directory Servers.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.</em>',
+	'LDAP_PASSWORD_EXPLAIN'			=> 'Leave blank to use anonymous binding. Else fill in the password for the above user. Required for Active Directory Servers.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
 	'LDAP_PORT'						=> 'LDAP server port',
 	'LDAP_PORT_EXPLAIN'				=> 'Optionally you can specify a port which should be used to connect to the LDAP server instead of the default port 389.',
 	'LDAP_SERVER'					=> 'LDAP server name',
@@ -504,7 +505,7 @@ $lang = array_merge($lang, array(
 	'SMTP_DIGEST_MD5'				=> 'DIGEST-MD5',
 	'SMTP_LOGIN'					=> 'LOGIN',
 	'SMTP_PASSWORD'					=> 'SMTP password',
-	'SMTP_PASSWORD_EXPLAIN'			=> 'Only enter a password if your SMTP server requires it.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.</em>',
+	'SMTP_PASSWORD_EXPLAIN'			=> 'Only enter a password if your SMTP server requires it.<br /><em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
 	'SMTP_PLAIN'					=> 'PLAIN',
 	'SMTP_POP_BEFORE_SMTP'			=> 'POP-BEFORE-SMTP',
 	'SMTP_PORT'						=> 'SMTP server port',
@@ -527,7 +528,7 @@ $lang = array_merge($lang, array(
 	'JAB_PACKAGE_SIZE'			=> 'Jabber package size',
 	'JAB_PACKAGE_SIZE_EXPLAIN'	=> 'This is the number of messages sent in one package. If set to 0 the message is sent immediately and will not be queued for later sending.',
 	'JAB_PASSWORD'				=> 'Jabber password',
-	'JAB_PASSWORD_EXPLAIN'		=> '<em><strong>Warning:</strong> This password will be stored as plain text in the database visible to everybody who can access your database or who can view this configuration page.</em>',
+	'JAB_PASSWORD_EXPLAIN'		=> '<em><strong>Warning:</strong> This password will be stored as plain text in the database, visible to everybody who can access your database or who can view this configuration page.</em>',
 	'JAB_PORT'					=> 'Jabber port',
 	'JAB_PORT_EXPLAIN'			=> 'Leave blank unless you know it is not port 5222.',
 	'JAB_SERVER'				=> 'Jabber server',
diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php
index 247d8a4140..951c69f915 100644
--- a/phpBB/language/en/acp/styles.php
+++ b/phpBB/language/en/acp/styles.php
@@ -165,11 +165,11 @@ $lang = array_merge($lang, array(
 	'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_FORUM_UNREAD'			=> 'Forum unread posts',
+	'IMG_FORUM_UNREAD_LOCKED'	=> 'Forum unread posts locked',
+	'IMG_FORUM_UNREAD_SUBFORUM'	=> 'Subforum unread posts',
 	'IMG_SUBFORUM_READ'			=> 'Legend subforum',
-	'IMG_SUBFORUM_UNREAD'		=> 'Legend subforum new posts',
+	'IMG_SUBFORUM_UNREAD'		=> 'Legend subforum unread posts',
 
 	'IMG_TOPIC_MOVED'			=> 'Topic moved',
 
@@ -180,39 +180,39 @@ $lang = array_merge($lang, array(
 	'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 popular new posts',
-	'IMG_TOPIC_UNREAD_HOT_MINE'		=> 'Topic popular posted to new',
-	'IMG_TOPIC_UNREAD_LOCKED'		=> 'Topic locked new',
-	'IMG_TOPIC_UNREAD_LOCKED_MINE'	=> 'Topic locked posted to new',
+	'IMG_TOPIC_UNREAD'				=> 'Topic unread posts',
+	'IMG_TOPIC_UNREAD_MINE'			=> 'Topic posted to unread',
+	'IMG_TOPIC_UNREAD_HOT'			=> 'Topic popular unread posts',
+	'IMG_TOPIC_UNREAD_HOT_MINE'		=> 'Topic popular posted to unread',
+	'IMG_TOPIC_UNREAD_LOCKED'		=> 'Topic locked unread',
+	'IMG_TOPIC_UNREAD_LOCKED_MINE'	=> 'Topic locked posted to unread',
 
 	'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_STICKY_UNREAD'				=> 'Sticky topic unread posts',
+	'IMG_STICKY_UNREAD_MINE'		=> 'Sticky topic posted to unread',
+	'IMG_STICKY_UNREAD_LOCKED'		=> 'Sticky topic locked unread posts',
+	'IMG_STICKY_UNREAD_LOCKED_MINE'	=> 'Sticky topic locked posted to unread',
 
 	'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_ANNOUNCE_UNREAD'				=> 'Announcement unread posts',
+	'IMG_ANNOUNCE_UNREAD_MINE'			=> 'Announcement posted to unread',
+	'IMG_ANNOUNCE_UNREAD_LOCKED'		=> 'Announcement locked unread posts',
+	'IMG_ANNOUNCE_UNREAD_LOCKED_MINE'	=> 'Announcement locked posted to unread',
 
 	'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_GLOBAL_UNREAD'					=> 'Global unread posts',
+	'IMG_GLOBAL_UNREAD_MINE'			=> 'Global posted to unread',
+	'IMG_GLOBAL_UNREAD_LOCKED'			=> 'Global locked unread posts',
+	'IMG_GLOBAL_UNREAD_LOCKED_MINE'		=> 'Global locked posted to unread',
 
 	'IMG_PM_READ'		=> 'Read private message',
 	'IMG_PM_UNREAD'		=> 'Unread private message',
diff --git a/phpBB/language/en/acp/users.php b/phpBB/language/en/acp/users.php
index 8d9bf0d486..eda9659795 100644
--- a/phpBB/language/en/acp/users.php
+++ b/phpBB/language/en/acp/users.php
@@ -42,6 +42,7 @@ $lang = array_merge($lang, array(
 	'BAN_ALREADY_ENTERED'	=> 'The ban had been previously entered successfully. The ban list has not been updated.',
 	'BAN_SUCCESSFUL'		=> 'Ban entered successfully.',
 
+	'CANNOT_BAN_ANONYMOUS'			=> 'You are not allowed to ban the anonymous account. Permissions for anonymous users can be set under the Permissions tab.',
 	'CANNOT_BAN_FOUNDER'			=> 'You are not allowed to ban founder accounts.',
 	'CANNOT_BAN_YOURSELF'			=> 'You are not allowed to ban yourself.',
 	'CANNOT_DEACTIVATE_BOT'			=> 'You are not allowed to deactivate bot accounts. Please deactivate the bot within the bots page instead.',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 03986c0361..bc38c1563d 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -347,8 +347,8 @@ $lang = array_merge($lang, array(
 	'NEW_MESSAGES'				=> 'New messages',
 	'NEW_PM'					=> '<strong>%d</strong> new message',
 	'NEW_PMS'					=> '<strong>%d</strong> new messages',
-	'NEW_POST'					=> 'New post',
-	'NEW_POSTS'					=> 'New posts',
+	'NEW_POST'					=> 'New post',	// Not used anymore
+	'NEW_POSTS'					=> 'New posts',	// Not used anymore
 	'NEXT'						=> 'Next',		// Used in pagination
 	'NEXT_STEP'					=> 'Next',
 	'NEVER'						=> 'Never',
@@ -381,7 +381,7 @@ $lang = array_merge($lang, array(
 	'NO_MODERATORS'				=> 'There are no moderators.',
 	'NO_NEW_MESSAGES'			=> 'No new messages',
 	'NO_NEW_PM'					=> '<strong>0</strong> new messages',
-	'NO_NEW_POSTS'				=> 'No new posts',
+	'NO_NEW_POSTS'				=> 'No new posts',	// Not used anymore
 	'NO_ONLINE_USERS'			=> 'No registered users',
 	'NO_POSTS'					=> 'No posts',
 	'NO_POSTS_TIME_FRAME'		=> 'No posts exist inside this topic for the selected time frame.',
@@ -395,6 +395,7 @@ $lang = array_merge($lang, array(
 	'NO_TOPICS'					=> 'There are no topics or posts in this forum.',
 	'NO_TOPICS_TIME_FRAME'		=> 'No topics exist inside this forum for the selected time frame.',
 	'NO_UNREAD_PM'				=> '<strong>0</strong> unread messages',
+	'NO_UNREAD_POSTS'			=> 'No unread posts',
 	'NO_UPLOAD_FORM_FOUND'		=> 'Upload initiated but no valid file upload form found.',
 	'NO_USER'					=> 'The requested user does not exist.',
 	'NO_USERS'					=> 'The requested users do not exist.',
@@ -641,6 +642,8 @@ $lang = array_merge($lang, array(
 	'UNREAD_MESSAGES'		=> 'Unread messages',
 	'UNREAD_PM'				=> '<strong>%d</strong> unread message',
 	'UNREAD_PMS'			=> '<strong>%d</strong> unread messages',
+	'UNREAD_POST'			=> 'Unread post',
+	'UNREAD_POSTS'			=> 'Unread posts',
 	'UNWATCHED_FORUMS'			=> 'You are no longer subscribed to the selected forums.',
 	'UNWATCHED_TOPICS'			=> 'You are no longer subscribed to the selected topics.',
 	'UNWATCHED_FORUMS_TOPICS'	=> 'You are no longer subscribed to the selected entries.',
diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php
index c76c281df5..3b7dc02d3f 100644
--- a/phpBB/language/en/help_faq.php
+++ b/phpBB/language/en/help_faq.php
@@ -128,7 +128,7 @@ $help = array(
 	),
 	array(
 		0 => 'Why can’t I add more poll options?',
-		1 => 'The limit for poll options is set by the board administrator. If you feel you need to add more options to your poll then the allowed amount, contact the board administrator.'
+		1 => 'The limit for poll options is set by the board administrator. If you feel you need to add more options to your poll than the allowed amount, contact the board administrator.'
 	),
 	array(
 		0 => 'How do I edit or delete a poll?',
diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php
index 546f91587d..d2fae20c62 100644
--- a/phpBB/language/en/viewforum.php
+++ b/phpBB/language/en/viewforum.php
@@ -48,16 +48,21 @@ $lang = array_merge($lang, array(
 
 	'MARK_TOPICS_READ'		=> 'Mark topics read',
 
-	'NEW_POSTS_HOT'			=> 'New posts [ Popular ]',
-	'NEW_POSTS_LOCKED'		=> 'New posts [ Locked ]',
-	'NO_NEW_POSTS_HOT'		=> 'No new posts [ Popular ]',
-	'NO_NEW_POSTS_LOCKED'	=> 'No new posts [ Locked ]',
+	'NEW_POSTS_HOT'			=> 'New posts [ Popular ]',	// Not used anymore
+	'NEW_POSTS_LOCKED'		=> 'New posts [ Locked ]',	// Not used anymore
+	'NO_NEW_POSTS_HOT'		=> 'No new posts [ Popular ]',	// Not used anymore
+	'NO_NEW_POSTS_LOCKED'	=> 'No new posts [ Locked ]',	// Not used anymore
 	'NO_READ_ACCESS'		=> 'You do not have the required permissions to read topics within this forum.',
+	'NO_UNREAD_POSTS_HOT'		=> 'No unread posts [ Popular ]',
+	'NO_UNREAD_POSTS_LOCKED'	=> 'No unread posts [ Locked ]',
 
 	'POST_FORUM_LOCKED'		=> 'Forum is locked',
 
 	'TOPICS_MARKED'			=> 'The topics for this forum have now been marked read.',
 
+	'UNREAD_POSTS_HOT'		=> 'Unread posts [ Popular ]',
+	'UNREAD_POSTS_LOCKED'	=> 'Unread posts [ Locked ]',
+
 	'VIEW_FORUM'			=> 'View forum',
 	'VIEW_FORUM_TOPIC'		=> '1 topic',
 	'VIEW_FORUM_TOPICS'		=> '%d topics',