4 files changed, 62 insertions, 42 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 55cd584bb1..72907c97cb 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -283,7 +283,8 @@ $lang = array_merge($lang, array(
 	'NEXT'						=> 'Next',
 	'NO'						=> 'No',
 	'NONE'						=> 'None',
-	'NOT_WATCHING_FORUM'		=> 'You no subscribe to updates on this forum',
+	'NOT_AUTHORIZED'			=> 'You are not authorized 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_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.',
@@ -404,6 +405,7 @@ $lang = array_merge($lang, array(
 	'SELECT_FORUM'				=> 'Select a forum',
 	'SEND_EMAIL'				=> 'Email',
 	'SEND_PRIVATE_MESSAGE'		=> 'Send private message',
+	'SETTINGS'					=> 'Settings',
 	'SIGNATURE'					=> 'Signature',
 	'SKIP'						=> 'Skip to content',
 	'SORRY_AUTH_READ'			=> 'You are not authorized to read this forum',
@@ -565,37 +567,45 @@ $lang = array_merge($lang, array(
 	),
 
 	'tz'				=> array(
-		'-12'	=> 'GMT - 12 Hours',
-		'-11'	=> 'GMT - 11 Hours',
-		'-10'	=> 'GMT - 10 Hours',
-		'-9'	=> 'GMT - 9 Hours',
-		'-8'	=> 'GMT - 8 Hours',
-		'-7'	=> 'GMT - 7 Hours',
-		'-6'	=> 'GMT - 6 Hours',
-		'-5'	=> 'GMT - 5 Hours',
-		'-4'	=> 'GMT - 4 Hours',
-		'-3.5'	=> 'GMT - 3.5 Hours',
-		'-3'	=> 'GMT - 3 Hours',
-		'-2'	=> 'GMT - 2 Hours',
-		'-1'	=> 'GMT - 1 Hour',
+		'-12'	=> 'GMT - 12 hours',
+		'-11'	=> 'GMT - 11 hours',
+		'-10'	=> 'GMT - 10 hours',
+		'-9.5'	=> 'GMT - 9:30 hours',
+		'-9'	=> 'GMT - 9 hours',
+		'-8'	=> 'GMT - 8 hours',
+		'-7'	=> 'GMT - 7 hours',
+		'-6'	=> 'GMT - 6 hours',
+		'-5'	=> 'GMT - 5 hours',
+		'-4'	=> 'GMT - 4 hours',
+		'-3.5'	=> 'GMT - 3:30 hours',
+		'-3'	=> 'GMT - 3 hours',
+		'-2'	=> 'GMT - 2 hours',
+		'-1'	=> 'GMT - 1 hour',
 		'0'		=> 'GMT',
-		'1'		=> 'GMT + 1 Hour',
-		'2'		=> 'GMT + 2 Hours',
-		'3'		=> 'GMT + 3 Hours',
-		'3.5'	=> 'GMT + 3.5 Hours',
-		'4'		=> 'GMT + 4 Hours',
-		'4.5'	=> 'GMT + 4.5 Hours',
-		'5'		=> 'GMT + 5 Hours',
-		'5.5'	=> 'GMT + 5.5 Hours',
-		'6'		=> 'GMT + 6 Hours',
-		'6.5'	=> 'GMT + 6.5 Hours',
-		'7'		=> 'GMT + 7 Hours',
-		'8'		=> 'GMT + 8 Hours',
-		'9'		=> 'GMT + 9 Hours',
-		'9.5'	=> 'GMT + 9.5 Hours',
-		'10'	=> 'GMT + 10 Hours',
-		'11'	=> 'GMT + 11 Hours',
-		'12'	=> 'GMT + 12 Hours',
+		'1'		=> 'GMT + 1 hour',
+		'2'		=> 'GMT + 2 hours',
+		'3'		=> 'GMT + 3 hours',
+		'3.5'	=> 'GMT + 3:30 hours',
+		'4'		=> 'GMT + 4 hours',
+		'4.5'	=> 'GMT + 4:30 hours',
+		'5'		=> 'GMT + 5 hours',
+		'5.5'	=> 'GMT + 5:30 hours',
+		'5.75'	=> 'GMT + 5:45 hours',
+		'6'		=> 'GMT + 6 hours',
+		'6.5'	=> 'GMT + 6:30 hours',
+		'7'		=> 'GMT + 7 hours',
+		'8'		=> 'GMT + 8 hours',
+		'8.75'	=> 'GMT + 8:45 hours',
+		'9'		=> 'GMT + 9 hours',
+		'9.5'	=> 'GMT + 9:30 hours',
+		'10'	=> 'GMT + 10 hours',
+		'10.5'	=> 'GMT + 10:30 hours',
+		'11'	=> 'GMT + 11 hours',
+		'11.5'	=> 'GMT + 11:30 hours',
+		'12'	=> 'GMT + 12 hours',
+		'12.75'	=> 'GMT + 12:45 hours',
+		'13'	=> 'GMT + 13 hours',
+		'14'	=> 'GMT + 14 hours',
 		'dst'	=> '[ DST ]',
 	),
 
@@ -603,13 +613,14 @@ $lang = array_merge($lang, array(
 		'-12'	=> '[GMT-12] Eniwetok, Kwaialein',
 		'-11'	=> '[GMT-11] Midway Island, Samoa',
 		'-10'	=> '[GMT-10] Hawaii, Honolulu',
+		'-9.5'	=> '[GMT-9:30] Marquesas Is.',
 		'-9'	=> '[GMT-9] Alaska, Anchorage',
 		'-8'	=> '[GMT-8] Los Angeles, San Francisco, Seattle',
 		'-7'	=> '[GMT-7] Denver, Edmonton, Phoenix, Salt Lake City, Santa Fe',
 		'-6'	=> '[GMT-6] Chicago, Guatemala, Mexico City, Saskatchewan East',
 		'-5'	=> '[GMT-5] Bogota, Kingston, Lima, New York',
 		'-4'	=> '[GMT-4] Caracas, Labrador, La Paz, Maritimes, Santiago',
-		'-3.5'	=> '[GMT-3.5] Standard Time [Canada], Newfoundland',
+		'-3.5'	=> '[GMT-3:30] Standard Time [Canada], Newfoundland',
 		'-3'	=> '[GMT-3] Brazilia, Buenos Aires, Georgetown, Rio de Janero',
 		'-2'	=> '[GMT-2] Mid-Atlantic',
 		'-1'	=> '[GMT-1] Azores, Cape Verde Is.',
@@ -617,20 +628,27 @@ $lang = array_merge($lang, array(
 		'1'		=> '[GMT+1] Amsterdam, Berlin, Bern, Brussells, Madrid, Paris, Rome, Oslo, Vienna',
 		'2'		=> '[GMT+2] Athens, Bucharest, Harare, Helsinki, Israel, Istanbul',
 		'3'		=> '[GMT+3] Ankara, Baghdad, Bahrain, Beruit, Kuwait, Moscow, Nairobi, Riyadh',
-		'3.5'	=> '[GMT+3.5] Iran',
+		'3.5'	=> '[GMT+3:30] Iran',
 		'4'		=> '[GMT+4] Abu Dhabi, Kabul, Muscat, Tbilisi, Volgograd',
-		'4.5'	=> '[GMT+4.5] Afghanistan',
+		'4.5'	=> '[GMT+4:30] Afghanistan',
 		'5'		=> '[GMT+5] Pakistan',
-		'5.5'	=> '[GMT+5.5] Calcutta, India, Madras, New Dehli',
-		'6'		=> '[GMT+6] Almaty, Dhakar, Kathmandu',
-		'6.5'	=> '[GMT+6.5] Rangoon',
+		'5.5'	=> '[GMT+5:30] Calcutta, India, Madras, New Dehli',
+		'5.75'	=> '[GMT+5:45] Kathmandu, Nepal',
+		'6'		=> '[GMT+6] Almaty, Dhakar, Sri Lanka',
+		'6.5'	=> '[GMT+6:30] Rangoon',
 		'7'		=> '[GMT+7] Bangkok, Hanoi, Jakarta, Phnom Penh',
 		'8'		=> '[GMT+8] Beijing, Hong Kong, Kuala Lumpar, Manila, Perth, Singapore, Taipei',
+		'8.75'	=> '[GMT+8:45] Caiguna, Eucla',
 		'9'		=> '[GMT+9] Osaka, Sapporo, Seoul, Tokyo, Yakutsk',
-		'9.5'	=> '[GMT+9.5] Adelaide, Darwin',
+		'9.5'	=> '[GMT+9:30] Adelaide, Darwin',
 		'10'	=> '[GMT+10] Brisbane, Canberra, Guam, Hobart, Melbourne, Port Moresby, Sydney',
+		'10.5'	=> '[GMT+10:30] Lord Howe Is.',
 		'11'	=> '[GMT+11] Magadan, New Caledonia, Solomon Is.',
-		'12'	=> '[GMT+12] Auckland, Fiji, Kamchatka, Marshall Is., Suva, Wellington'
+		'11.5'	=> '[GMT+11:30] Norfolk Is.',
+		'12'	=> '[GMT+12] Auckland, Fiji, Kamchatka, Marshall Is., Suva, Wellington',
+		'12.75'	=> '[GMT+12:45] Chatham Is.',
+		'13'	=> '[GMT+13] Tonga, Phoenix Is.',
+		'14'	=> '[GMT+14] Line Is.',
 	),
 
 	// The value is only an example and will get replaced by the current time on view
diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php
index 854a472133..5ab9bacfd5 100644
--- a/phpBB/language/en/mcp.php
+++ b/phpBB/language/en/mcp.php
@@ -265,6 +265,7 @@ $lang = array_merge($lang, array(
 	'RETURN_MESSAGE'		=> 'Click %sHere%s to return to the message',
 	'RETURN_NEW_FORUM'		=> 'Click %sHere%s to return to the new forum',
 	'RETURN_NEW_TOPIC'		=> 'Click %sHere%s to return to the new topic',
+	'RETURN_POST'			=> 'Click %sHere%s to return to the post',
 	'RETURN_QUEUE'			=> 'Click %sHere%s to return to the queue',
 	'RETURN_REPORTS'		=> 'Click %sHere%s to return to the reports',
 
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index a5fccc50f2..13eb24ff38 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -67,8 +67,8 @@ $lang = array_merge($lang, array(
 	'IM_AIM'				=> 'Please note that you need AOL Instant Messenger installed to use this.',
 	'IM_AIM_EXPRESS'		=> 'AIM Express',
 	'IM_DOWNLOAD_APP'		=> 'Download Application',
-	'IM_ICQ'				=> 'Please note that users may have elected to not receive unsolicited instant messages.',
-	'IM_JABBER'				=> 'Please note that users may have elected to not receive unsolicited instant messages.',
+	'IM_ICQ'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
+	'IM_JABBER'				=> 'Please note that users may have selected to not receive unsolicited instant messages.',
 	'IM_JABBER_SUBJECT'		=> 'This is an automated message please do not reply! Message from user %1$s at %2$s',
 	'IM_MESSAGE'			=> 'Your Message',
 	'IM_MSNM'				=> 'Please note that you need Windows Messenger installed to use this.',
@@ -86,6 +86,7 @@ $lang = array_merge($lang, array(
 	'LESS_THAN'				=> 'Less than',
 	'LIST_USER'				=> '1 User',
 	'LIST_USERS'			=> '%d Users',
+	'LOGIN_EXPLAIN_VIEWPROFILE'	=> 'The board administrator requires you to be registered and logged in to view profiles.',
 
 	'MORE_THAN'				=> 'More than',
 	'MSNM'					=> 'MSNM',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index c36e39042a..eb1ad6d45b 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -343,7 +343,7 @@ $lang = array_merge($lang, array(
 
 	'UCP'						=> 'User Control Panel',
 	'UCP_ACTIVATE'				=> 'Activate account',
-	'UCP_ADMIN_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will an email at the address you specified.',
+	'UCP_ADMIN_ACTIVATE'		=> 'Please note that you will need to enter a valid email address before your account is activated. The administrator will review your account and if approved you will receive an email at the address you specified.',
 	'UCP_AIM'					=> 'AOL Instant Messenger',
 	'UCP_ATTACHMENTS'			=> 'Attachments',
 	'UCP_COPPA_BEFORE'			=> 'Before %s',