mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-13 04:04:12 +02:00
[ticket/10161] all "e-mail" strings in language files changed to "email"
according to Oleg's comment: email is preferred by RFCs and probably the way of the future PHPBB3-10161
This commit is contained in:
Senky
@@ -49,9 +49,9 @@ $lang = array_merge($lang, array(
|
||||
<br />
|
||||
We may also create cookies external to the phpBB software whilst browsing “%1$s”, though these are outside the scope of this document which is intended to only cover the pages created by the phpBB software. The second way in which we collect your information is by what you submit to us. This can be, and is not limited to: posting as an anonymous user (hereinafter “anonymous posts”), registering on “%1$s” (hereinafter “your account”) and posts submitted by you after registration and whilst logged in (hereinafter “your posts”).<br />
|
||||
<br />
|
||||
Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid e-mail address (hereinafter “your e-mail”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your e-mail address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated e-mails from the phpBB software.<br />
|
||||
Your account will at a bare minimum contain a uniquely identifiable name (hereinafter “your user name”), a personal password used for logging into your account (hereinafter “your password”) and a personal, valid email address (hereinafter “your email”). Your information for your account at “%1$s” is protected by data-protection laws applicable in the country that hosts us. Any information beyond your user name, your password, and your email address required by “%1$s” during the registration process is either mandatory or optional, at the discretion of “%1$s”. In all cases, you have the option of what information in your account is publicly displayed. Furthermore, within your account, you have the option to opt-in or opt-out of automatically generated emails from the phpBB software.<br />
|
||||
<br />
|
||||
Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your e-mail, then the phpBB software will generate a new password to reclaim your account.<br />
|
||||
Your password is ciphered (a one-way hash) so that it is secure. However, it is recommended that you do not reuse the same password across a number of different websites. Your password is the means of accessing your account at “%1$s”, so please guard it carefully and under no circumstance will anyone affiliated with “%1$s”, phpBB or another 3rd party, legitimately ask you for your password. Should you forget your password for your account, you can use the “I forgot my password” feature provided by the phpBB software. This process will ask you to submit your user name and your email, then the phpBB software will generate a new password to reclaim your account.<br />
|
||||
',
|
||||
));
|
||||
|
||||
@@ -61,13 +61,13 @@ $lang = array_merge($lang, array(
|
||||
'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated.',
|
||||
'ACCOUNT_ACTIVE_PROFILE' => 'Your account has now been successfully reactivated.',
|
||||
'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password.',
|
||||
'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your e-mail for details.',
|
||||
'ACCOUNT_EMAIL_CHANGED' => 'Your account has been updated. However, this board requires account reactivation on e-mail changes. An activation key has been sent to the new e-mail address you provided. Please check your e-mail for further information.',
|
||||
'ACCOUNT_EMAIL_CHANGED_ADMIN' => 'Your account has been updated. However, this board requires account reactivation by the administrators on e-mail changes. An e-mail has been sent to them and you will be informed when your account has been reactivated.',
|
||||
'ACCOUNT_INACTIVE' => 'Your account has been created. However, this board requires account activation, an activation key has been sent to the e-mail address you provided. Please check your e-mail for further information.',
|
||||
'ACCOUNT_INACTIVE_ADMIN' => 'Your account has been created. However, this board requires account activation by the administrator group. An e-mail has been sent to them and you will be informed when your account has been activated.',
|
||||
'ACTIVATION_EMAIL_SENT' => 'The activation e-mail has been sent to your e-mail address.',
|
||||
'ACTIVATION_EMAIL_SENT_ADMIN' => 'The activation e-mail has been sent to the administrators e-mail addresses.',
|
||||
'ACCOUNT_COPPA' => 'Your account has been created but has to be approved, please check your email for details.',
|
||||
'ACCOUNT_EMAIL_CHANGED' => 'Your account has been updated. However, this board requires account reactivation on email changes. An activation key has been sent to the new email address you provided. Please check your email for further information.',
|
||||
'ACCOUNT_EMAIL_CHANGED_ADMIN' => 'Your account has been updated. However, this board requires account reactivation by the administrators on email changes. An email has been sent to them and you will be informed when your account has been reactivated.',
|
||||
'ACCOUNT_INACTIVE' => 'Your account has been created. However, this board 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 board requires account activation by the administrator group. 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.',
|
||||
'ACTIVATION_EMAIL_SENT_ADMIN' => 'The activation email has been sent to the administrators email addresses.',
|
||||
'ADD' => 'Add',
|
||||
'ADD_BCC' => 'Add [BCC]',
|
||||
'ADD_FOES' => 'Add new foes',
|
||||
@@ -79,7 +79,7 @@ $lang = array_merge($lang, array(
|
||||
'ADD_RULE' => 'Add rule',
|
||||
'ADD_TO' => 'Add [To]',
|
||||
'ADD_USERS_UCP_EXPLAIN' => 'Here you can add new users to the group. You may select whether this group becomes the new default for the selected users. Please enter each username on a separate line.',
|
||||
'ADMIN_EMAIL' => 'Administrators can e-mail me information',
|
||||
'ADMIN_EMAIL' => 'Administrators can email me information',
|
||||
'AGREE' => 'I agree to these terms',
|
||||
'ALLOW_PM' => 'Allow users to send you private messages',
|
||||
'ALLOW_PM_EXPLAIN' => 'Note that administrators and moderators will always be able to send you messages.',
|
||||
@@ -134,7 +134,7 @@ $lang = array_merge($lang, array(
|
||||
'CREATE_FOLDER' => 'Add folder…',
|
||||
'CURRENT_IMAGE' => 'Current image',
|
||||
'CURRENT_PASSWORD' => 'Current password',
|
||||
'CURRENT_PASSWORD_EXPLAIN' => 'You must confirm your current password if you wish to change it, alter your e-mail address or username.',
|
||||
'CURRENT_PASSWORD_EXPLAIN' => 'You must confirm your current password if you wish to change it, alter your email address or username.',
|
||||
'CUR_PASSWORD_EMPTY' => 'You did not enter your current password.',
|
||||
'CUR_PASSWORD_ERROR' => 'The current password you entered is incorrect.',
|
||||
'CUSTOM_DATEFORMAT' => 'Custom…',
|
||||
@@ -164,17 +164,17 @@ $lang = array_merge($lang, array(
|
||||
'DEMOTE_SELECTED' => 'Demote selected',
|
||||
'DISABLE_CENSORS' => 'Enable word censoring',
|
||||
'DISPLAY_GALLERY' => 'Display gallery',
|
||||
'DOMAIN_NO_MX_RECORD_EMAIL' => 'The entered e-mail domain has no valid MX record.',
|
||||
'DOMAIN_NO_MX_RECORD_EMAIL' => 'The entered email domain has no valid MX record.',
|
||||
'DOWNLOADS' => 'Downloads',
|
||||
'DRAFTS_DELETED' => 'All selected drafts were successfully deleted.',
|
||||
'DRAFTS_EXPLAIN' => 'Here you can view, edit and delete your saved drafts.',
|
||||
'DRAFT_UPDATED' => 'Draft successfully updated.',
|
||||
|
||||
'EDIT_DRAFT_EXPLAIN' => 'Here you are able to edit your draft. Drafts do not contain attachment and poll information.',
|
||||
'EMAIL_BANNED_EMAIL' => 'The e-mail address you entered is not allowed to be used.',
|
||||
'EMAIL_INVALID_EMAIL' => 'The e-mail address you entered is invalid.',
|
||||
'EMAIL_REMIND' => 'This must be the e-mail address associated with your account. If you have not changed this via your user control panel then it is the e-mail address you registered your account with.',
|
||||
'EMAIL_TAKEN_EMAIL' => 'The entered e-mail address is already in use.',
|
||||
'EMAIL_BANNED_EMAIL' => 'The email address you entered is not allowed to be used.',
|
||||
'EMAIL_INVALID_EMAIL' => 'The email address you entered is invalid.',
|
||||
'EMAIL_REMIND' => 'This must be the email address associated with your account. If you have not changed this via your user control panel then it is the email address you registered your account with.',
|
||||
'EMAIL_TAKEN_EMAIL' => 'The entered email address is already in use.',
|
||||
'EMPTY_DRAFT' => 'You must enter a message to submit your changes.',
|
||||
'EMPTY_DRAFT_TITLE' => 'You must enter a draft title.',
|
||||
'EXPORT_AS_XML' => 'Export as XML',
|
||||
@@ -286,7 +286,7 @@ $lang = array_merge($lang, array(
|
||||
'NEW_PASSWORD_ERROR' => 'The passwords you entered do not match.',
|
||||
'NOTIFY_METHOD' => 'Notification method',
|
||||
'NOTIFY_METHOD_BOTH' => 'Both',
|
||||
'NOTIFY_METHOD_EMAIL' => 'E-mail only',
|
||||
'NOTIFY_METHOD_EMAIL' => 'Email only',
|
||||
'NOTIFY_METHOD_EXPLAIN' => 'Method for sending messages sent via this board.',
|
||||
'NOTIFY_METHOD_IM' => 'Jabber only',
|
||||
'NOTIFY_ON_PM' => 'Notify me on new private messages',
|
||||
@@ -324,7 +324,7 @@ $lang = array_merge($lang, array(
|
||||
'NO_BOOKMARKS' => 'You have no bookmarks.',
|
||||
'NO_BOOKMARKS_SELECTED' => 'You have selected no bookmarks.',
|
||||
'NO_EDIT_READ_MESSAGE' => 'Private message cannot be edited because it has already been read.',
|
||||
'NO_EMAIL_USER' => 'The e-mail/username information submitted could not be found.',
|
||||
'NO_EMAIL_USER' => 'The email/username information submitted could not be found.',
|
||||
'NO_FOES' => 'No foes currently defined',
|
||||
'NO_FRIENDS' => 'No friends currently defined',
|
||||
'NO_FRIENDS_OFFLINE' => 'No friends offline',
|
||||
@@ -350,7 +350,7 @@ $lang = array_merge($lang, array(
|
||||
'PASS_TYPE_SYMBOL_EXPLAIN' => 'Password must be between %1$s and %2$s long, must contain letters in mixed case, must contain numbers and must contain symbols.',
|
||||
'PASSWORD' => 'Password',
|
||||
'PASSWORD_ACTIVATED' => 'Your new password has been activated.',
|
||||
'PASSWORD_UPDATED' => 'A new password was sent to your registered e-mail address.',
|
||||
'PASSWORD_UPDATED' => 'A new password was sent to your registered email address.',
|
||||
'PERMISSIONS_RESTORED' => 'Successfully restored original permissions.',
|
||||
'PERMISSIONS_TRANSFERRED' => 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
|
||||
'PM_DISABLED' => 'Private messaging has been disabled on this board.',
|
||||
@@ -408,7 +408,7 @@ $lang = array_merge($lang, array(
|
||||
'SEARCH_YOUR_POSTS' => 'Show your posts',
|
||||
'SEND_PASSWORD' => 'Send password',
|
||||
'SENT_AT' => 'Sent', // Used before dates in private messages
|
||||
'SHOW_EMAIL' => 'Users can contact me by e-mail',
|
||||
'SHOW_EMAIL' => 'Users can contact me by email',
|
||||
'SIGNATURE_EXPLAIN' => 'This is a block of text that can be added to posts you make. There is a %d character limit.',
|
||||
'SIGNATURE_PREVIEW' => 'Your signature will appear like this in posts',
|
||||
'SIGNATURE_TOO_LONG' => 'Your signature is too long.',
|
||||
@@ -427,12 +427,12 @@ $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 e-mail address before your account is activated. The administrator will review your account and if approved you will receive an e-mail 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',
|
||||
'UCP_COPPA_ON_AFTER' => 'On or after %s',
|
||||
'UCP_EMAIL_ACTIVATE' => 'Please note that you will need to enter a valid e-mail address before your account is activated. You will receive an e-mail at the address you provide that contains an account activation link.',
|
||||
'UCP_EMAIL_ACTIVATE' => 'Please note that you will need to enter a valid email address before your account is activated. You will receive an email at the address you provide that contains an account activation link.',
|
||||
'UCP_ICQ' => 'ICQ number',
|
||||
'UCP_JABBER' => 'Jabber address',
|
||||
|
||||
@@ -472,7 +472,7 @@ $lang = array_merge($lang, array(
|
||||
|
||||
'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.',
|
||||
'UCP_REMIND' => 'Send password',
|
||||
'UCP_RESEND' => 'Send activation e-mail',
|
||||
'UCP_RESEND' => 'Send activation email',
|
||||
'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',
|
||||
'UCP_ZEBRA' => 'Friends & Foes',
|
||||
|
||||
Reference in New Issue
Block a user