aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-04-29 01:18:57 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-04-29 01:18:57 +0000
commit7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c (patch)
tree9dc3802635b2309fa5f8cb96e46ac5cae4a88b00 /phpBB/language/en
parent656274cd5798ef9e62c23cdf0c3c1d66d612263d (diff)
downloadforums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar.gz
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar.bz2
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.tar.xz
forums-7bc05c5e24ca632f3aa5dfd1fe1e6bd145f9d34c.zip
- fixing some bugs, containing fixes for anonymous username displays, eaccelerator issue, permission trace and a few smaller bugs.
git-svn-id: file:///svn/phpbb/trunk@5858 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/acp/permissions.php1
-rw-r--r--phpBB/language/en/common.php156
-rw-r--r--phpBB/language/en/memberlist.php9
-rw-r--r--phpBB/language/en/posting.php2
-rw-r--r--phpBB/language/en/viewtopic.php3
5 files changed, 87 insertions, 84 deletions
diff --git a/phpBB/language/en/acp/permissions.php b/phpBB/language/en/acp/permissions.php
index 1ce066aac4..5915712c62 100644
--- a/phpBB/language/en/acp/permissions.php
+++ b/phpBB/language/en/acp/permissions.php
@@ -145,6 +145,7 @@ $lang = array_merge($lang, array(
'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_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.',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 88c50c7858..377415c221 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -573,88 +573,88 @@ $lang = array_merge($lang, array(
),
'tz' => array(
- '-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: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',
+ '-12' => 'UTC - 12 hours',
+ '-11' => 'UTC - 11 hours',
+ '-10' => 'UTC - 10 hours',
+ '-9.5' => 'UTC - 9:30 hours',
+ '-9' => 'UTC - 9 hours',
+ '-8' => 'UTC - 8 hours',
+ '-7' => 'UTC - 7 hours',
+ '-6' => 'UTC - 6 hours',
+ '-5' => 'UTC - 5 hours',
+ '-4' => 'UTC - 4 hours',
+ '-3.5' => 'UTC - 3:30 hours',
+ '-3' => 'UTC - 3 hours',
+ '-2' => 'UTC - 2 hours',
+ '-1' => 'UTC - 1 hour',
+ '0' => 'UTC',
+ '1' => 'UTC + 1 hour',
+ '2' => 'UTC + 2 hours',
+ '3' => 'UTC + 3 hours',
+ '3.5' => 'UTC + 3:30 hours',
+ '4' => 'UTC + 4 hours',
+ '4.5' => 'UTC + 4:30 hours',
+ '5' => 'UTC + 5 hours',
+ '5.5' => 'UTC + 5:30 hours',
+ '5.75' => 'UTC + 5:45 hours',
+ '6' => 'UTC + 6 hours',
+ '6.5' => 'UTC + 6:30 hours',
+ '7' => 'UTC + 7 hours',
+ '8' => 'UTC + 8 hours',
+ '8.75' => 'UTC + 8:45 hours',
+ '9' => 'UTC + 9 hours',
+ '9.5' => 'UTC + 9:30 hours',
+ '10' => 'UTC + 10 hours',
+ '10.5' => 'UTC + 10:30 hours',
+ '11' => 'UTC + 11 hours',
+ '11.5' => 'UTC + 11:30 hours',
+ '12' => 'UTC + 12 hours',
+ '12.75' => 'UTC + 12:45 hours',
+ '13' => 'UTC + 13 hours',
+ '14' => 'UTC + 14 hours',
'dst' => '[ DST ]',
),
'tz_zones' => 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: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.',
- '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:30] Iran',
- '4' => '[GMT+4] Abu Dhabi, Kabul, Muscat, Tbilisi, Volgograd',
- '4.5' => '[GMT+4:30] Afghanistan',
- '5' => '[GMT+5] Pakistan',
- '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: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.',
- '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.',
+ '-12' => '[UTC - 12, Y] Baker Island Time',
+ '-11' => '[UTC - 11, X] Niue Time, Samoa Standard Time',
+ '-10' => '[UTC - 10, W] Hawaii-Aleutian Standard Time, Cook Island Time',
+ '-9.5' => '[UTC - 9:30, V*] Marquesas Islands Time',
+ '-9' => '[UTC - 9, V] Alaska Standard Time, Gambier Island Time',
+ '-8' => '[UTC - 8, U] Pacific Standard Time',
+ '-7' => '[UTC - 7, T] Mountain Standard Time',
+ '-6' => '[UTC - 6, S] Central Standard Time',
+ '-5' => '[UTC - 5, R] Eastern Standard Time',
+ '-4' => '[UTC - 4, Q] Atlantic Standard Time',
+ '-3.5' => '[UTC - 3:30, P*] Newfoundland Standard Time',
+ '-3' => '[UTC - 3, P] Amazon Standard Time, Central Greenland Time',
+ '-2' => '[UTC - 2, O] Fernando de Noronha Time, South Georgia &amp; the South Sandwich Islands Time',
+ '-1' => '[UTC - 1, N] Azores Standard Time, Cape Verde Time, Eastern Greenland Time',
+ '0' => '[UTC, Z] Western European Time, Greenwich Mean Time',
+ '1' => '[UTC + 1, A] Central European Time, West African Time',
+ '2' => '[UTC + 2, B] Eastern European Time, Central African Time',
+ '3' => '[UTC + 3, C] Moscow Standard Time, Eastern African Time',
+ '3.5' => '[UTC + 3:30, C*] Iran Standard Time',
+ '4' => '[UTC + 4, D] Gulf Standard Time, Samara Standard Time',
+ '4.5' => '[UTC + 4:30, D*] Afghanistan Time',
+ '5' => '[UTC + 5, E] Pakistan Standard Time, Yekaterinburg Standard Time',
+ '5.5' => '[UTC + 5:30, E*] Indian Standard Time, Sri Lanka Time',
+ '5.75' => '[UTC + 5:45, E&Dagger;] Nepal Time',
+ '6' => '[UTC + 6, F] Bangladesh Time, Bhutan Time, Novosibirsk Standard Time',
+ '6.5' => '[UTC + 6:30, F*] Cocos Islands Time, Myanmar Time',
+ '7' => '[UTC + 7, G] Indochina Time, Krasnoyarsk Standard Time',
+ '8' => '[UTC + 8, H] Chinese Standard Time, Australian Western Standard Time, Irkutsk Standard Time',
+ '8.75' => '[UTC + 8:45, H&Dagger;] Southeastern Western Australia Standard Time',
+ '9' => '[UTC + 9, I] Japan Standard Time, Korea Standard Time, Chita Standard Time',
+ '9.5' => '[UTC + 9:30, I*] Australian Central Standard Time',
+ '10' => '[UTC + 10, K] Australian Eastern Standard Time, Vladivostok Standard Time',
+ '10.5' => '[UTC + 10:30, K*] Lord Howe Standard Time',
+ '11' => '[UTC + 11, L] Solomon Island Time, Magadan Standard Time',
+ '11.5' => '[UTC + 11:30, L*] Norfolk Island Time',
+ '12' => '[UTC + 12, M] New Zealand Time, Fiji Time, Kamchatka Standard Time',
+ '12.75' => '[UTC + 12:45, M&Dagger;] Chatham Islands Time',
+ '13' => '[UTC + 13, M*] Tonga Time, Phoenix Islands Time',
+ '14' => '[UTC + 14, M&dagger;] Line Island Time',
),
// The value is only an example and will get replaced by the current time on view
diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php
index 204fb91adf..09155f5b03 100644
--- a/phpBB/language/en/memberlist.php
+++ b/phpBB/language/en/memberlist.php
@@ -82,10 +82,11 @@ $lang = array_merge($lang, array(
'JABBER' => 'Jabber',
- 'LAST_ACTIVE' => 'Last active',
- 'LESS_THAN' => 'Less than',
- 'LIST_USER' => '1 User',
- 'LIST_USERS' => '%d Users',
+ 'LAST_ACTIVE' => 'Last active',
+ 'LESS_THAN' => 'Less than',
+ 'LIST_USER' => '1 User',
+ 'LIST_USERS' => '%d Users',
+ 'LOGIN_EXPLAIN_LEADERS' => 'The board administrator requires you to be registered and logged in to view the team listing.',
'LOGIN_EXPLAIN_VIEWPROFILE' => 'The board administrator requires you to be registered and logged in to view profiles.',
'MORE_THAN' => 'More than',
diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php
index 692c43a3fe..3ff773ab20 100644
--- a/phpBB/language/en/posting.php
+++ b/phpBB/language/en/posting.php
@@ -39,7 +39,7 @@ $lang = array_merge($lang, array(
'ATTACH_SIG' => 'Attach a signature (signatures can be altered via the UCP)',
'BBCODE_A_HELP' => 'Close all open bbCode tags',
- 'BBCODE_B_HELP' => 'Bold text: [b]text[/b] (alt+b)',
+ 'BBCODE_B_HELP' => 'Bold text: [b]text[/b] \' (alt+b)',
'BBCODE_C_HELP' => 'Code display: [code]code[/code] (alt+c)',
'BBCODE_E_HELP' => 'List: Add list element',
'BBCODE_F_HELP' => 'Font size: [size=x-small]small text[/size]',
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index b211fc82bf..b1ee86a42a 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -29,7 +29,8 @@ 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(
- 'ATTACHMENT' => 'Attachment',
+ 'ATTACHMENT' => 'Attachment',
+ 'ATTACHMENT_FUNCTIONALITY_DISABLED' => 'Attachment has been disabled',
'BOOKMARK_ADDED' => 'Bookmarked Topic successfully.',
'BOOKMARK_REMOVED' => 'Removed Bookmarked Topic successfully.',
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-14 14:26:14 +0000