diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-03-31 16:44:18 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-03-31 16:44:18 +0000 |
| commit | a43416dbb2019980913fbb6449adbe2e6a3fbea9 (patch) | |
| tree | 25af7514cb7ae9e11480e1fa09e271024f456733 /phpBB/language/en/acp | |
| parent | c6b0b621651e52bccc778cd9d1e8cf8cf02bc2de (diff) | |
| download | forums-a43416dbb2019980913fbb6449adbe2e6a3fbea9.tar forums-a43416dbb2019980913fbb6449adbe2e6a3fbea9.tar.gz forums-a43416dbb2019980913fbb6449adbe2e6a3fbea9.tar.bz2 forums-a43416dbb2019980913fbb6449adbe2e6a3fbea9.tar.xz forums-a43416dbb2019980913fbb6449adbe2e6a3fbea9.zip | |
- acp popup, shouldn't require 700 px width
- throw an error if an image that's edited into an imageset doesn't exist
- convert the password not its hash ;-)
- only update user_login_attempts if necessary
- make password requirements even clearer
git-svn-id: file:///svn/phpbb/trunk@7250 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 | ||||
| -rw-r--r-- | phpBB/language/en/acp/search.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/styles.php | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index b072581e54..68fea544ab 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -357,7 +357,7 @@ $lang = array_merge($lang, array( 'NO_IP_VALIDATION' => 'None', 'PASSWORD_TYPE' => 'Password complexity', 'PASSWORD_TYPE_EXPLAIN' => 'Determines how complex a password needs to be when set or altered, subsequent options include the previous ones.', - 'PASS_TYPE_ALPHA' => 'Must contain alphanumerics', + 'PASS_TYPE_ALPHA' => 'Must contain letters and numbers', 'PASS_TYPE_ANY' => 'No requirements', 'PASS_TYPE_CASE' => 'Must be mixed case', 'PASS_TYPE_SYMBOL' => 'Must contain symbols', diff --git a/phpBB/language/en/acp/search.php b/phpBB/language/en/acp/search.php index 5982eec31a..7f1c5c708b 100644 --- a/phpBB/language/en/acp/search.php +++ b/phpBB/language/en/acp/search.php @@ -78,8 +78,8 @@ $lang = array_merge($lang, array( 'SEARCH_GUEST_INTERVAL' => 'Guest search flood interval', 'SEARCH_GUEST_INTERVAL_EXPLAIN' => 'Number of seconds guests must wait between searches. If one guest searches all others have to wait until the time interval passed.', - 'SEARCH_INDEX_CREATE_REDIRECT' => 'All posts up to post id %d have now been indexed, of which %d posts were within this step.<br />The current rate of indexing is approximately %.1f posts per second.<br />Indexing in progress…', - 'SEARCH_INDEX_DELETE_REDIRECT' => 'All posts up to post id %d have been removed from the search index.<br />Deleting in progress…', + 'SEARCH_INDEX_CREATE_REDIRECT' => 'All posts up to post id %1$d have now been indexed, of which %2$d posts were within this step.<br />The current rate of indexing is approximately %3$.1f posts per second.<br />Indexing in progress…', + 'SEARCH_INDEX_DELETE_REDIRECT' => 'All posts up to post id %1$d have been removed from the search index.<br />Deleting in progress…', 'SEARCH_INDEX_CREATED' => 'Successfully indexed all posts in the board database.', 'SEARCH_INDEX_REMOVED' => 'Successfully deleted the search index for this backend.', 'SEARCH_INTERVAL' => 'User search flood interval', diff --git a/phpBB/language/en/acp/styles.php b/phpBB/language/en/acp/styles.php index c5c9438edd..73bbf0ad9f 100644 --- a/phpBB/language/en/acp/styles.php +++ b/phpBB/language/en/acp/styles.php @@ -285,6 +285,7 @@ $lang = array_merge($lang, array( 'NO_CLASS' => 'Cannot find class in stylesheet.', 'NO_IMAGESET' => 'Cannot find imageset on filesystem.', 'NO_IMAGE' => 'No image', + 'NO_IMAGE_ERROR' => 'Cannot find image on filesystem.', 'NO_STYLE' => 'Cannot find style on filesystem.', 'NO_TEMPLATE' => 'Cannot find template on filesystem.', 'NO_THEME' => 'Cannot find theme on filesystem.', |