diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-12-29 23:01:19 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-12-29 23:01:19 +0100 |
| commit | 979158f0a2e1ab88685f608e8756ff40248b86cf (patch) | |
| tree | a2c1e8ba17bce08e1439a45ef3529516ad9469a4 /phpBB/language | |
| parent | 541879dc5ce4290d51bf0e888879e3cd9967d1a2 (diff) | |
| parent | c54683be8c0493a51d9a1dbf4c605e95d17940b2 (diff) | |
| download | forums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar forums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar.gz forums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar.bz2 forums-979158f0a2e1ab88685f608e8756ff40248b86cf.tar.xz forums-979158f0a2e1ab88685f608e8756ff40248b86cf.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9348] Call phpbb_set_encoding() on config value 'default_dateformat'.
[ticket/9953] Set focus to password on re-authentication
[ticket/9905] Add SQLite to the DSN description
[ticket/9859] Remove years from the credit line.
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/install.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/install.php b/phpBB/language/en/install.php index 96a1f0e704..021f5eccb0 100644 --- a/phpBB/language/en/install.php +++ b/phpBB/language/en/install.php @@ -128,7 +128,7 @@ $lang = array_merge($lang, array( 'DB_ERR_QUERY_FIRST_TABLE' => 'Error while executing <var>query_first</var>, %s (“%s”).', 'DB_ERR_SELECT' => 'Error while running <code>SELECT</code> query.', 'DB_HOST' => 'Database server hostname or DSN', - 'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs. On PostgreSQL, use localhost to connect to the local server via UNIX domain socket and 127.0.0.1 to connect via TCP.', + 'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs. On PostgreSQL, use localhost to connect to the local server via UNIX domain socket and 127.0.0.1 to connect via TCP. For SQLite, enter the full path to your database file.', 'DB_NAME' => 'Database name', 'DB_PASSWORD' => 'Database password', 'DB_PORT' => 'Database server port', |