diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-30 10:49:06 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-03-30 10:49:06 +0000 |
| commit | 9f82dec04b18813c060e5a090a149c1a2c140689 (patch) | |
| tree | efab7d5e9ce8166ff4bff69d180c82230c3df481 /phpBB/language/en | |
| parent | 331a549c42a74472d27dadbe213618a7b914a737 (diff) | |
| download | forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.gz forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.bz2 forums-9f82dec04b18813c060e5a090a149c1a2c140689.tar.xz forums-9f82dec04b18813c060e5a090a149c1a2c140689.zip | |
some changes/bugfixes
git-svn-id: file:///svn/phpbb/trunk@7241 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
| -rw-r--r-- | phpBB/language/en/common.php | 20 | ||||
| -rw-r--r-- | phpBB/language/en/ucp.php | 15 |
2 files changed, 21 insertions, 14 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index fff463b5e9..87f1ee44a1 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -61,19 +61,20 @@ $lang = array_merge($lang, array( 'ALL_TIMES' => 'All times are %1$s %2$s', 'ALL_TOPICS' => 'All Topics', 'AND' => 'And', - 'ARE_WATCHING_FORUM' => 'You have subscribed to receive updates on this forum', + 'ARE_WATCHING_FORUM' => 'You have subscribed to receive updates on this forum.', 'ARE_WATCHING_TOPIC' => 'You have subscribed to receive updates on this topic.', 'ASCENDING' => 'Ascending', 'ATTACHMENTS' => 'Attachments', 'ATTACHED_IMAGE_NOT_IMAGE' => 'You tried to attach an invalid image file.', 'AUTHOR' => 'Author', - 'AUTH_NO_PROFILE_CREATED' => 'Creating a user profile failed', - 'AVATAR_DISALLOWED_EXTENSION' => 'The extension %s is not allowed', + 'AUTH_NO_PROFILE_CREATED' => 'Creating a user profile failed.', + 'AVATAR_DISALLOWED_EXTENSION' => 'The extension %s is not allowed.', 'AVATAR_EMPTY_REMOTE_DATA' => 'Avatar could not be uploaded, the remote data appears to be invalid or corrupted.', - 'AVATAR_INVALID_FILENAME' => '%s is an invalid filename', + 'AVATAR_EMPTY_FILEUPLOAD' => 'The uploaded avatar file is empty.', + 'AVATAR_INVALID_FILENAME' => '%s is an invalid filename.', 'AVATAR_NOT_UPLOADED' => 'Avatar could not be uploaded.', 'AVATAR_NO_SIZE' => 'Could not obtain width or height of linked avatar, please enter them manually.', - 'AVATAR_PARTIAL_UPLOAD' => 'The uploaded file was only partially uploaded', + 'AVATAR_PARTIAL_UPLOAD' => 'The uploaded file was only partially uploaded.', 'AVATAR_PHP_SIZE_NA' => 'The avatar’s filesize is too large.<br />Could not determine the maximum size defined by PHP in php.ini.', 'AVATAR_PHP_SIZE_OVERRUN' => 'The avatar’s filesize is too large, maximum upload size is %d MB.<br />Please note this is set in php.ini and cannot be overridden.', 'AVATAR_URL_INVALID' => 'The URL you specified is invalid.', @@ -136,9 +137,12 @@ $lang = array_merge($lang, array( 'DISPLAY_TOPICS' => 'Display topics from previous', 'DOWNLOADED' => 'Downloaded', 'DOWNLOADING_FILE' => 'Downloading file', - 'DOWNLOAD_COUNT' => '%d time', - 'DOWNLOAD_COUNTS' => '%d times', - 'DOWNLOAD_NONE' => '0 times', + 'DOWNLOAD_COUNT' => 'Downloaded %d time', + 'DOWNLOAD_COUNTS' => 'Downloaded %d times', + 'DOWNLOAD_COUNT_NONE' => 'Not downloaded yet', + 'VIEWED_COUNT' => 'Viewed %d time', + 'VIEWED_COUNTS' => 'Viewed %d times', + 'VIEWED_COUNT_NONE' => 'Not viewed yet', 'EDIT_POST' => 'Edit post', 'EMAIL' => 'Email', diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 0ed68da8fe..d099152954 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -53,13 +53,16 @@ $lang = array_merge($lang, array( // Common language entries $lang = array_merge($lang, array( - 'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering', - 'ACCOUNT_ACTIVE_ADMIN' => 'The account has now been activated', - 'ACCOUNT_ADDED' => 'Thank you for registering, your account has been created. You may now login with your username and password', + 'ACCOUNT_ACTIVE' => 'Your account has now been activated. Thank you for registering.', + '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 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', + 'ACCOUNT_EMAIL_CHANGED' => 'Your account has been updated. However, this forum 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 forum 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 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', |