- fixed custom profile field get/store

- changed tz lang array to hold more descriptive timezones (no more tz+-13, dst is a seperate option) - fixed bugs after jabber queue processing (data being escaped differently) git-svn-id: file:///svn/phpbb/trunk@5116 89ea8834-ac86-4346-8a33-228a782c2dd0
author: Meik Sievertsen <acydburn@phpbb.com> 2005-04-10 11:21:01 +0000
committer: Meik Sievertsen <acydburn@phpbb.com> 2005-04-10 11:21:01 +0000
commit: c9478353171267a3ebc5d87b43d759d22684b21e (patch)
tree: 0c2de101bd65d5c24e73344be53b2d9619ce037d /phpBB/language/en
parent: a01705c7d04581871c3028d7369815ecd06fca75 (diff)
download: forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar
forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar.gz
forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar.bz2
forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar.xz
forums-c9478353171267a3ebc5d87b43d759d22684b21e.zip
2 files changed, 35 insertions, 144 deletions
diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php
index ce8795b983..08b032870a 100644
--- a/phpBB/language/en/admin.php
+++ b/phpBB/language/en/admin.php
@@ -800,6 +800,8 @@ $lang += array(
 	'ACC_DISABLE'				=> 'Disable',
 	'VISUAL_CONFIRM'			=> 'Enable visual confirmation',
 	'VISUAL_CONFIRM_EXPLAIN'	=> 'Requires new users enter a random code matching an image to help prevent mass registrations.',
+	'LOGIN_LIMIT'				=> 'Login attempts',
+	'LOGIN_LIMIT_EXPLAIN'		=> 'Number of failed logins users can make before being locked out that session',
 	'REG_LIMIT'					=> 'Registration attempts',
 	'REG_LIMIT_EXPLAIN'			=> 'Number of attempts users can make at the confirmation code before being locked out that session.',
 	'FORCE_PASS_CHANGE'			=> 'Force password change',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 1dc3784860..2a4505956a 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -52,7 +52,7 @@ $lang += array(
 	'ALL_FORUMS'			=> 'All Forums',
 	'ALL_MESSAGES'			=> 'All Messages',
 	'ALL_POSTS'				=> 'All Posts',
-	'ALL_TIMES'				=> 'All times are %s %s',
+	'ALL_TIMES'				=> 'All times are GMT%1$s %2$s',
 	'ALL_TOPICS'			=> 'All Topics',
 	'AND'					=> 'And',
 	'ARE_WATCHING_FORUM'	=> 'You have subscribed to receive updates on this forum',
@@ -484,150 +484,39 @@ $lang += array(
 	),
 
 	'tz'				=> array(
-		'-13'	=> 'GMT - 13 Hours',
-		'-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.5'	=> 'GMT - 2.5 Hours',
-		'-2'	=> 'GMT - 2 Hours',
-		'-1'	=> 'GMT - 1 Hours',
-		'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',
-		'10.5'	=> 'GMT + 10.5 Hours',
-		'11'	=> 'GMT + 11 Hours',
-		'12'	=> 'GMT + 12 Hours',
-		'13'	=> 'GMT + 13 Hours',
-		'dst'	=> '[ DST ]'
+		'-12'	=> '[GMT-12] Eniwetok, Kwaialein',
+		'-11'	=> '[GMT-11] Midway Island, Samoa',
+		'-10'	=> '[GMT-10] Hawaii, Honolulu',
+		'-9'	=> '[GMT-9] Alaska',
+		'-8'	=> '[GMT-8] Anchorage, Los Angeles, San Francisco, Seattle',
+		'-7'	=> '[GMT-7] Denver, Edmonton, Phoenix, Salt Lake City, Santa Fe',
+		'-6'	=> '[GMT-6] Chicago, Guatamala, 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'	=> '[GMT-3] Brazilia, Buenos Aires, Georgetown, Rio de Janero',
+		'-2'	=> '[GMT-2] Mid-Atlantic',
+		'-1'	=> '[GMT-1] Azores, Cape Verde Is.',
+		'0'		=> '[GMT] Dublin, Edinburgh, Iceland, Lisbon, London, Casablanca',
+		'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',
+		'4'		=> '[GMT+4] Abu Dhabi, Kabul, Muscat, Tbilisi, Volgograd',
+		'4.5'	=> '[GMT+4.5] Afghanistan',
+		'5'		=> '[GMT+5] Calcutta, Madras, New Dehli',
+		'5.5'	=> '[GMT+5.5] India',
+		'6'		=> '[GMT+6] Almaty, Dhakar, Kathmandu',
+		'6.5'	=> '[GMT+6.5] Rangoon',
+		'7'		=> '[GMT+7] Bangkok, Hanoi, Jakarta, Phnom Penh',
+		'8'		=> '[GMT+8] Beijing, Hong Kong, Kuala Lumpar, Manila, Perth, Singapore, Taipei',
+		'9'		=> '[GMT+9] Osaka, Sapporo, Seoul, Tokyo, Yakutsk',
+		'9.5'	=> '[GMT+9.5] Adelaide, Darwin',
+		'10'	=> '[GMT+10) Brisbane, Canberra, Guam, Hobart, Melbourne, Port Moresby, Sydney',
+		'11'	=> '[GMT+11] Magadan, New Caledonia, Solomon Is.',
+		'12'	=> '[GMT+12] Auckland, Fiji, Kamchatka, Marshall Is., Suva, Wellington',
+		'dst'	=> '[DST]'
 	),
 );
 
-/* Pool of unused or currently not assignable language variables
-$unused = array(
-	'ALREADY_VOTED' => 'You have already voted in this poll and may not change your selection.',
-	'AM' => 'AM',
-	'AVATAR' => 'Avatar',
-	'Add_member' => 'Add Member',
-	'All_Messages' => 'All Messages',
-	'Already_member_group' => 'You are already a member of this group',
-	'Approve_selected' => 'Approve Selected',
-	'Are_group_moderator' => 'You are the group moderator',
-	'BY' => 'by',
-	'CANNOT_DELETE_POLL' => 'Sorry but you cannot delete an active poll.',
-	'CANNOT_SPLIT_FIRST_POST' => 'You cannot split the first post of a topic',
-	'CONTACT' => 'Contact',
-	'Cannot_send_privmsg' => 'Sorry but the administrator has prevented you from sending private messages',
-	'Confirm_delete_pm' => 'Are you sure you want to delete this message?',
-	'Confirm_delete_pms' => 'Are you sure you want to delete these messages?',
-	'Confirm_unsub' => 'Are you sure you want to unsubscribe from this group?',
-	'Confirm_unsub_pending' => 'Your subscription to this group has not yet been approved, are you sure you want to unsubscribe?',
-	'Could_not_add_user' => 'The user you selected does not exist',
-	'Could_not_anon_user' => 'You cannot make Anonymous a group member',
-	'Current_memberships' => 'Current memberships',
-	'DESCRIPTION' => 'Description',
-	'DOWNLOAD' => 'Download',
-	'Date' => 'Date',
-	'Deny_selected' => 'Deny Selected',
-	'Disable_BBCode_pm' => 'Disable BBCode in this message',
-	'Disable_HTML_pm' => 'Disable HTML in this message',
-	'Disable_Smilies_pm' => 'Disable Smilies in this message',
-	'Display_messages' => 'Display messages from previous',
-	'EDIT_OWN_POSTS' => 'Sorry but you can only edit your own posts.',
-	'EMAIL_TAKEN_EMAIL' => 'The email address you specified is already in use, please select an alternative.',
-	'ERROR' => 'Error',
-	'Edit_message' => 'Edit private message',
-	'Find' => 'Find',
-	'Flag' => 'Flag',
-	'From' => 'From',
-	'IP_ADDRESS' => 'IP Address',
-	'Inbox' => 'Inbox',
-	'Inbox_size' => 'Your Inbox is %d%% full',
-	'Join_group' => 'Join Group',
-	'LOGOUT' => 'Logout',
-	'Login_to_join' => 'Login to join or manage group memberships',
-	'Member_this_group' => 'You are a member of this group',
-	'Memberships_pending' => 'Memberships pending',
-	'Message_sent' => 'Your message has been sent',
-	'NEVER' => 'Never',
-	'NOT_AUTHORISED' => 'Not Authorised',
-	'NO_MODE' => 'No mode specified.',
-	'No_folder' => 'No folder specified',
-	'No_group_members' => 'This group has no members',
-	'No_match' => 'No matches found',
-	'No_messages_folder' => 'You have no messages in this folder',
-	'No_pending_group_members' => 'This group has no pending members',
-	'No_such_folder' => 'No such folder exists',
-	'No_such_user' => 'Sorry but no such user exists',
-	'No_to_user' => 'You must specify a username to send this message',
-	'Non_member_groups' => 'Non-member groups',
-	'Not_group_moderator' => 'You are not this groups moderator therefor you cannot preform that action.',
-	'Not_logged_in' => 'You must be logged in to join a group.',
-	'Notification_subject' => 'New Private Message has arrived',
-	'Outbox' => 'Outbox',
-	'PASSWORD_MISMATCH' => 'The passwords you entered did not match',
-	'PLEASE_SELECT_FORUM' => 'Please select a forum',
-	'POLL_DELETED' => 'Your poll has been deleted successfully',
-	'POSTER_CHANGED_SUCESS' => 'The poster of this message has been successfully changed',
-	'POST_IGNORE' => 'This post was made by <b>%1$s</b> who is on your ignore list. To display this post click %sHERE%s.',
-	'POST_TOPIC_LOCKED' => 'Topic is locked',
-	'Pending_members' => 'Pending Members',
-	'Pending_this_group' => 'Your membership of this group is pending',
-	'RATING' => 'Rating',
-	'RESULT_DIR' => 'Order results',
-	'RETURN_GROUP' => 'Click %sHere%s to return to the Group Control Panel',
-	'RETURN_LOGIN' => 'Click %sHere%s to try again',
-	'RETURN_MCP' => 'Click %sHere%s to return to the Moderator Control Panel',
-	'Read_message' => 'Read message',
-	'Read_pm' => 'Read message',
-	'Remove_selected' => 'Remove Selected',
-	'SEARCH_PREVIOUS' => 'Search previous',
-	'SIGNATURE_NOTICE' => 'Please note that some forums limit the size and content of your signature. Be sure to read any forum or board rules to ensure you comply with them.',
-	'SORT_POSTS' => 'Total posts',
-	'SORT_WEBSITE' => 'Website',
-	'SPELLCHECK' => 'Spellcheck',
-	'START_PAGE' => 'Make my start page',
-	'Save_marked' => 'Save Marked',
-	'Save_message' => 'Save Message',
-	'Savebox' => 'Savebox',
-	'Savebox_size' => 'Your Savebox is %d%% full',
-	'Saved' => 'Saved',
-	'Send_a_new_message' => 'Send a new private message',
-	'Send_a_reply' => 'Reply to a private message',
-	'Sent' => 'Sent',
-	'Sentbox_size' => 'Your Sentbox is %d%% full',
-	'This_closed_group' => 'This is a closed group, no more users accepted',
-	'This_hidden_group' => 'This is a hidden group, automatic user addition is not allowed',
-	'This_open_group' => 'This is an open group, click to request membership',
-	'To_long_subject' => 'The subject is too long it must be 60 characters or less.',
-	'UNREAD_NO_PM' => 'You have no unread private messages',
-	'UPDATE' => 'Update',
-	'USER_OFFLINE' => 'Offline',
-	'Unsub_success' => 'You have been un-subscribed from this group.',
-	'User_is_member_group' => 'User is already a member of this group',
-	'VIEWING_MESSAGES' => 'Viewing Private Messages',
-	'View_Information' => 'View Information'
-);
-*/
-
 ?>
 \ No newline at end of file
author	Meik Sievertsen <acydburn@phpbb.com>	2005-04-10 11:21:01 +0000
committer	Meik Sievertsen <acydburn@phpbb.com>	2005-04-10 11:21:01 +0000
commit	c9478353171267a3ebc5d87b43d759d22684b21e (patch)
tree	0c2de101bd65d5c24e73344be53b2d9619ce037d /phpBB/language/en
parent	a01705c7d04581871c3028d7369815ecd06fca75 (diff)
download	forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar.gz forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar.bz2 forums-c9478353171267a3ebc5d87b43d759d22684b21e.tar.xz forums-c9478353171267a3ebc5d87b43d759d22684b21e.zip