Merge branch 'ticket/p/6726' into develop-olympus

* ticket/p/6726:
  [ticket/6726] Added localhost/127.0.0.1 note to database server hostname explanation in install language.
This commit is contained in:
Nils Adermann 2010-05-14 01:41:31 +02:00
commit b3bbe57603

View file

@ -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_QUERY_FIRST_TABLE' => 'Error while executing <var>query_first</var>, %s (“%s”).',
'DB_ERR_SELECT' => 'Error while running <code>SELECT</code> query.', 'DB_ERR_SELECT' => 'Error while running <code>SELECT</code> query.',
'DB_HOST' => 'Database server hostname or DSN', 'DB_HOST' => 'Database server hostname or DSN',
'DB_HOST_EXPLAIN' => 'DSN stands for Data Source Name and is relevant only for ODBC installs.', '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_NAME' => 'Database name', 'DB_NAME' => 'Database name',
'DB_PASSWORD' => 'Database password', 'DB_PASSWORD' => 'Database password',
'DB_PORT' => 'Database server port', 'DB_PORT' => 'Database server port',