diff options
author | Meik Sievertsen <acydburn@phpbb.com> | 2005-04-09 12:26:45 +0000 |
---|---|---|
committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-04-09 12:26:45 +0000 |
commit | fc32df035889dd74f2cfc1c62bb793d36f333ec2 (patch) | |
tree | 12134eada004226d1ea5b31b420d1c63f05e7376 /phpBB/language | |
parent | 0ba3f620d4afb963b89c532b664693c974ec4f8a (diff) | |
download | forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.gz forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.bz2 forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.tar.xz forums-fc32df035889dd74f2cfc1c62bb793d36f333ec2.zip |
- Documentation related changes
- added resend activation email dialog
- fixed issue in session code
- log failed/successful admin re-authentication/login
- fixed simple forum dropdown box (used in mcp and posting)
git-svn-id: file:///svn/phpbb/trunk@5114 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language')
-rw-r--r-- | phpBB/language/en/admin.php | 32 | ||||
-rw-r--r-- | phpBB/language/en/common.php | 45 | ||||
-rw-r--r-- | phpBB/language/en/email/user_resend_inactive.txt | 21 | ||||
-rw-r--r-- | phpBB/language/en/groups.php | 25 | ||||
-rw-r--r-- | phpBB/language/en/help_bbcode.php | 24 | ||||
-rw-r--r-- | phpBB/language/en/help_faq.php | 24 | ||||
-rw-r--r-- | phpBB/language/en/mcp.php | 26 | ||||
-rw-r--r-- | phpBB/language/en/memberlist.php | 27 | ||||
-rw-r--r-- | phpBB/language/en/posting.php | 27 | ||||
-rw-r--r-- | phpBB/language/en/search.php | 25 | ||||
-rw-r--r-- | phpBB/language/en/ucp.php | 31 | ||||
-rw-r--r-- | phpBB/language/en/viewforum.php | 27 | ||||
-rw-r--r-- | phpBB/language/en/viewtopic.php | 27 |
13 files changed, 196 insertions, 165 deletions
diff --git a/phpBB/language/en/admin.php b/phpBB/language/en/admin.php index 11d0676c97..ce8795b983 100644 --- a/phpBB/language/en/admin.php +++ b/phpBB/language/en/admin.php @@ -1,17 +1,18 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : admin.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- - -// DO NOT CHANGE +/** +* +* admin [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +/** +* DO NOT CHANGE +*/ if (empty($lang) || !is_array($lang)) { $lang = array(); @@ -201,6 +202,7 @@ $lang += array( 'log_prune_user_del_anon'=> '<b>Users Pruned and Posts Retained</b><br />%s', 'LOG_RESYNC_STATS' => '<b>Post, topic and user stats reset</b>', + 'LOG_RESYNC_POSTCOUNTS' => '<b>User postcounts synced</b>', 'LOG_RESET_DATE' => '<b>Board start date reset</b>', 'LOG_RESET_ONLINE' => '<b>Most users online reset</b>', @@ -277,9 +279,6 @@ $lang += array( 'LOG_JAB_REGISTER' => '<b>Jabber account registered</b>', 'LOG_JAB_CHANGED' => '<b>Jabber account changed</b>', - 'LOG_EMAIL_ERROR' => '%s', - 'LOG_JABBER_ERROR' => '%s', - 'LOG_BOT_ADDED' => '<b>New bot added</b><br />» %s', 'LOG_BOT_UPDATED' => '<b>Existing bot updated</b><br />» %s', 'LOG_BOT_DELETE' => '<b>Deleted bot</b><br />» %s', @@ -316,6 +315,7 @@ $lang += array( 'RESET_ONLINE' => 'Reset Online', 'RESET_DATE' => 'Reset Date', 'RESYNC_STATS' => 'Resync Stats', + 'RESYNC_POSTCOUNTS' => 'Resync Postcounts', 'INACTIVE_USERS' => 'Inactive Users', 'INACTIVE_USERS_EXPLAIN'=> 'This is a list of users who have registered but whos accounts are inactive. You can activate, delete or remind (by sending an email) these users if you wish.', diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 5fdaf1f94e..1dc3784860 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -1,17 +1,18 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : common.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- +/** +* +* common [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ -// DO NOT CHANGE +/** +* DO NOT CHANGE +*/ if (empty($lang) || !is_array($lang)) { $lang = array(); @@ -43,6 +44,7 @@ $lang += array( '6_MONTHS' => '6 Months', '7_DAYS' => '7 Days', + 'ACCOUNT_ALREADY_ACTIVATED' => 'Your account is already activated', 'ACCOUNT_NOT_ACTIVATED' => 'Your account has not been activated yet', 'ACP' => 'Administration Control Panel', 'ACTIVE_ERROR' => 'You have specified an inactive username. Please activate your account and try again. If you continue to have problems please contact a board administrator.', @@ -173,19 +175,6 @@ $lang += array( 'JUMP_PAGE' => 'Enter the page number you wish to goto', 'JUMP_TO' => 'Jump to', - 'KARMA' => array( - '-5' => 'Extremely Bad', - '-4' => 'Very Bad', - '-3' => 'Very Poor', - '-2' => 'Bad', - '-1' => 'Poor', - '0' => 'Neutral', - '1' => 'Positive', - '2' => 'Good', - '3' => 'Very Good', - '4' => 'Extremely good', - '5' => 'Excellent' - ), 'KB' => 'KB', 'LAST_POST' => 'Last Post', @@ -208,8 +197,13 @@ $lang += array( 'LOGIN_INFO' => 'In order to login you must be registered. Registering takes only a few seconds but gives you increased capabilies. The board administrator may also grant additional permissions to registered users. Before you login please ensure you are familiar with our terms of use and related policies. Please ensure you read any forum rules as you navigate around the board.', 'LOGIN_VIEWFORUM' => 'The board administrator requires you to be registered and logged in to view this forum.', 'LOGOUT_USER' => 'Logout [ %s ]', + 'LOG_ADMIN_AUTH_FAIL' => '<b>Failed administration login attempt</b>', + 'LOG_ADMIN_AUTH_SUCCESS'=> '<b>Sucessful administration login</b>', 'LOG_DELETE_TOPIC' => '<b>Deleted topic</b><br />» %s', + 'LOG_EMAIL_ERROR' => '<b>Email error<br />» %s', + 'LOG_JABBER_ERROR' => '<b>Jabber error<br />» %s', 'LOG_ME_IN' => 'Log me on automatically each visit', + 'LOG_USER_FEEDBACK' => '<b>Added user feedback</b><br />» %s', 'LOG_USER_GENERAL' => '%s', 'MARK' => 'Mark', @@ -311,6 +305,7 @@ $lang += array( 'REPLY_WITH_QUOTE' => 'Reply with quote', 'REPLYING_GLOBAL_ANNOUNCE' => 'Replying to global announcement', 'REPLYING_MESSAGE' => 'Replying to message in %s', + 'RESEND_ACTIVATION' => 'Resend activation email', 'RESET' => 'Reset', 'RETURN_INDEX' => 'Click %sHere%s to return to the index', 'RETURN_FORUM' => 'Click %sHere%s to return to the forum', diff --git a/phpBB/language/en/email/user_resend_inactive.txt b/phpBB/language/en/email/user_resend_inactive.txt new file mode 100644 index 0000000000..bc4dd02d2d --- /dev/null +++ b/phpBB/language/en/email/user_resend_inactive.txt @@ -0,0 +1,21 @@ +Subject: Welcome to {SITENAME} Forums +Charset: iso-8859-1 + +{WELCOME_MSG} + +Please keep this email for your records. Your account information is as follows: + +---------------------------- +Username: {USERNAME} +---------------------------- + +Your password has been encrypted in our database. Should you forget your password you can request a new one which will be activated in the same way as this account. + +Your account is currently inactive. You cannot use it until you visit the following link: + +{U_ACTIVATE} + + +Thank you for registering. + +{EMAIL_SIG}
\ No newline at end of file diff --git a/phpBB/language/en/groups.php b/phpBB/language/en/groups.php index 0186ce0ad1..2e857d94b5 100644 --- a/phpBB/language/en/groups.php +++ b/phpBB/language/en/groups.php @@ -1,17 +1,18 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : gcp.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- +/** +* +* groups [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ -// DO NOT CHANGE +/** +* DO NOT CHANGE +*/ if (empty($lang) || !is_array($lang)) { $lang = array(); diff --git a/phpBB/language/en/help_bbcode.php b/phpBB/language/en/help_bbcode.php index 8d1f82c802..e1e9da0535 100644 --- a/phpBB/language/en/help_bbcode.php +++ b/phpBB/language/en/help_bbcode.php @@ -1,15 +1,17 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : help_bbcode.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- +/** +* +* help_bbcode [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +/** +*/ // DEVELOPERS PLEASE NOTE // diff --git a/phpBB/language/en/help_faq.php b/phpBB/language/en/help_faq.php index 40ab168cbc..b7d72674f5 100644 --- a/phpBB/language/en/help_faq.php +++ b/phpBB/language/en/help_faq.php @@ -1,15 +1,17 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : help_faq.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- +/** +* +* help_faq [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +/** +*/ // DEVELOPERS PLEASE NOTE // diff --git a/phpBB/language/en/mcp.php b/phpBB/language/en/mcp.php index 5ed67f1922..8e8018cdc0 100644 --- a/phpBB/language/en/mcp.php +++ b/phpBB/language/en/mcp.php @@ -1,17 +1,18 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : mcp.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- +/** +* +* mcp [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ -// DO NOT CHANGE +/** +* DO NOT CHANGE +*/ if (empty($lang) || !is_array($lang)) { $lang = array(); @@ -98,6 +99,7 @@ $lang += array( 'LOG_UNLOCK' => '<b>Unlocked topic</b><br />» %s', 'LOG_UNLOCK_POST' => '<b>Unlocked post</b><br />» %s', 'LOG_UNRATE' => '<b>Unrated post</b><br />» %s', + 'LOG_USER_LOCK' => '<b>User locked own topic</b><br />» %s', 'LOGVIEW_VIEWTOPIC' => 'View Topic', 'LOGVIEW_VIEWLOGS' => 'View Topic Log', 'LOGVIEW_VIEWFORUM' => 'View Forum', diff --git a/phpBB/language/en/memberlist.php b/phpBB/language/en/memberlist.php index 7606be0887..25d68b8215 100644 --- a/phpBB/language/en/memberlist.php +++ b/phpBB/language/en/memberlist.php @@ -1,17 +1,18 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : memberlist.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- - -// DO NOT CHANGE +/** +* +* memberlist [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +/** +* DO NOT CHANGE +*/ if (empty($lang) || !is_array($lang)) { $lang = array(); diff --git a/phpBB/language/en/posting.php b/phpBB/language/en/posting.php index 4da1335136..8aa8228256 100644 --- a/phpBB/language/en/posting.php +++ b/phpBB/language/en/posting.php @@ -1,17 +1,18 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : posting.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- - -// DO NOT CHANGE +/** +* +* posting [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +/** +* DO NOT CHANGE +*/ if (empty($lang) || !is_array($lang)) { $lang = array(); diff --git a/phpBB/language/en/search.php b/phpBB/language/en/search.php index 34052cc0d4..526b28d632 100644 --- a/phpBB/language/en/search.php +++ b/phpBB/language/en/search.php @@ -1,17 +1,18 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : search.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- +/** +* +* search [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ -// DO NOT CHANGE +/** +* DO NOT CHANGE +*/ if (empty($lang) || !is_array($lang)) { $lang = array(); diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 0e2cee3c7f..df3e591638 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -1,17 +1,18 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : ucp.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- - -// DO NOT CHANGE +/** +* +* ucp [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +/** +* DO NOT CHANGE +*/ if (empty($lang) || !is_array($lang)) { $lang = array(); @@ -33,6 +34,7 @@ $lang += array( 'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your email for details.', 'ACCOUNT_INACTIVE' => 'Your account has been created. However, this forum requires account activation, an activation key has been sent to the email address you provided. Please check your email for further information', 'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this forum requires account activation by the administrator. An email has been sent to them and you will be informed when your account has been activated', + 'ACTIVATION_EMAIL_SENT' => 'The activation email has been sent to your email address', 'ADD' => 'Add', 'ADD_BCC' => 'Add [Bcc]', 'ADD_FOES' => 'Add new foes', @@ -305,6 +307,7 @@ $lang += array( 'SORT_POST_TIME' => 'Post Time', 'SORT_SIZE' => 'Filesize', + 'TERMS_OF_USE_CONTENT' => 'While the administrators and moderators of this forum will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts by these people) and hence will not be held liable.<br /><br />You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, move or close any topic at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.<br /><br />This forum system uses cookies to store information on your local computer. These cookies do not contain any of the information you have entered above, they serve only to improve your viewing pleasure. The email address is used only for confirming your registration details and password (and for sending new passwords should you forget your current one).<br /><br />By clicking Register below you agree to be bound by these conditions.', 'TIMEZONE' => 'Timezone', 'TO' => 'To', 'TOO_MANY_RECIPIENTS' => 'Too many recipients', @@ -312,7 +315,6 @@ $lang += array( 'UCP' => 'User Control Panel', '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_AGREEMENT' => 'While the administrators and moderators of this forum will attempt to remove or edit any generally objectionable material as quickly as possible, it is impossible to review every message. Therefore you acknowledge that all posts made to these forums express the views and opinions of the author and not the administrators, moderators or webmaster (except for posts by these people) and hence will not be held liable.<br /><br />You agree not to post any abusive, obscene, vulgar, slanderous, hateful, threatening, sexually-orientated or any other material that may violate any applicable laws. Doing so may lead to you being immediately and permanently banned (and your service provider being informed). The IP address of all posts is recorded to aid in enforcing these conditions. You agree that the webmaster, administrator and moderators of this forum have the right to remove, edit, move or close any topic at any time should they see fit. As a user you agree to any information you have entered above being stored in a database. While this information will not be disclosed to any third party without your consent the webmaster, administrator and moderators cannot be held responsible for any hacking attempt that may lead to the data being compromised.<br /><br />This forum system uses cookies to store information on your local computer. These cookies do not contain any of the information you have entered above, they serve only to improve your viewing pleasure. The email address is used only for confirming your registration details and password (and for sending new passwords should you forget your current one).<br /><br />By clicking Register below you agree to be bound by these conditions.', 'UCP_AIM' => 'AOL Instant Messenger', 'UCP_ATTACHMENTS' => 'Attachments', 'UCP_COPPA_BEFORE' => 'Before %s', @@ -350,6 +352,7 @@ $lang += array( 'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.', 'UCP_REMIND' => 'Send password', + 'UCP_RESEND' => 'Send activation email', 'UCP_WATCHED' => 'Watched items', 'UCP_WELCOME' => 'Welcome to the User Control Panel. From here you can monitor, view and update your profile, preferences, subscribed forums and topics. You can also send messages to other users (if permitted). Please ensure you read any announcements before continuing.', 'UCP_YIM' => 'Yahoo Messenger', diff --git a/phpBB/language/en/viewforum.php b/phpBB/language/en/viewforum.php index 0769970918..602a98682d 100644 --- a/phpBB/language/en/viewforum.php +++ b/phpBB/language/en/viewforum.php @@ -1,17 +1,18 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : viewforum.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL vs2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- - -// DO NOT CHANGE +/** +* +* viewforum [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +/** +* DO NOT CHANGE +*/ if (empty($lang) || !is_array($lang)) { $lang = array(); diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index cfb348fef1..3a5a21dd83 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -1,17 +1,18 @@ <?php -// ------------------------------------------------------------- -// -// $Id$ -// -// FILENAME : viewtopic.php [ English ] -// STARTED : Sat Dec 16, 2000 -// COPYRIGHT : © 2001, 2003 phpBB Group -// WWW : http://www.phpbb.com/ -// LICENCE : GPL v2.0 [ see /docs/COPYING ] -// -// ------------------------------------------------------------- - -// DO NOT CHANGE +/** +* +* viewtopic [English] +* +* @package phpBB3 +* @version $Id$ +* @copyright (c) 2005 phpBB Group +* @license http://opensource.org/licenses/gpl-license.php GNU Public License +* +*/ + +/** +* DO NOT CHANGE +*/ if (empty($lang) || !is_array($lang)) { $lang = array(); |