diff options
author | Henry Sudhof <kellanved@phpbb.com> | 2007-07-02 14:05:21 +0000 |
---|---|---|
committer | Henry Sudhof <kellanved@phpbb.com> | 2007-07-02 14:05:21 +0000 |
commit | 4aa578c73de276a7ed05f842825409009576bd92 (patch) | |
tree | b78324d82193627fb58d1c6c1eec50b217cb4dc4 /phpBB/language/en/ucp.php | |
parent | 1330f4ffdad6a250e612b0bcb4e598e0a80e6bbc (diff) | |
download | forums-4aa578c73de276a7ed05f842825409009576bd92.tar forums-4aa578c73de276a7ed05f842825409009576bd92.tar.gz forums-4aa578c73de276a7ed05f842825409009576bd92.tar.bz2 forums-4aa578c73de276a7ed05f842825409009576bd92.tar.xz forums-4aa578c73de276a7ed05f842825409009576bd92.zip |
Adding the bot mark/unmark links already promised in the changelog.
Adds backlinks to the success screen after closing reports (#12905)
Some style and language fixes (#12493, #12235, #11235, #11949) - the latter is still not perfect.
Added code to the phpBB2 converter to deal with slashed quotes (#12607)
Changes and adds language entries :)
git-svn-id: file:///svn/phpbb/trunk@7822 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/ucp.php')
-rw-r--r-- | phpBB/language/en/ucp.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index de000cd0b3..4c402d9b59 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -82,7 +82,7 @@ $lang = array_merge($lang, array( 'ATTACHMENTS_DELETED' => 'Attachments successfully deleted.', 'ATTACHMENT_DELETED' => 'Attachment successfully deleted.', 'AVATAR_CATEGORY' => 'Category', - 'AVATAR_EXPLAIN' => 'Maximum dimensions; width %1$d pixels, height %2$d pixels, file size %3$dkB.', + 'AVATAR_EXPLAIN' => 'Maximum dimensions; width: %1$d pixels, height: %2$d pixels, file size: %3$dkB.', 'AVATAR_FEATURES_DISABLED' => 'The avatar functionality is currently disabled.', 'AVATAR_GALLERY' => 'Local gallery', 'AVATAR_GENERAL_UPLOAD_ERROR' => 'Could not upload avatar to %s.', @@ -441,7 +441,7 @@ $lang = array_merge($lang, array( 'UNWATCH_MARKED' => 'Unwatch marked', 'UPLOAD_AVATAR_FILE' => 'Upload from your machine', 'UPLOAD_AVATAR_URL' => 'Upload from a URL', - 'UPLOAD_AVATAR_URL_EXPLAIN' => 'Enter the URL of the location containing the image, it will be copied to this site.', + 'UPLOAD_AVATAR_URL_EXPLAIN' => 'Enter the URL of the location containing the image. The image will be copied to this site.', 'USERNAME_ALPHA_ONLY_EXPLAIN' => 'Username must be between %1$d and %2$d chars long and use only alphanumeric characters.', 'USERNAME_ALPHA_SPACERS_EXPLAIN'=> 'Username must be between %1$d and %2$d chars long and use alphanumeric, space or -+_[] characters.', 'USERNAME_ASCII_EXPLAIN' => 'Username must be between %1$d and %2$d chars long and use only ASCII characters, so no special symbols.', |