The branch, master has been updated via 21c014ebf1d28ff56da37d7e6163c34425ed8197 (commit) from 0518ab3708586467227a9d1887b8c9530e8a356b (commit)

- Log ----------------------------------------------------------------- commit 21c014ebf1d28ff56da37d7e6163c34425ed8197 Author: Michal Čihař mcihar@novell.com Date: Tue Mar 30 14:08:37 2010 +0200

Mention gettext based usage rather than old select_lang.

-----------------------------------------------------------------------

Summary of changes: Documentation.html | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Documentation.html b/Documentation.html index 21a969d..e9c8ade 100644 --- a/Documentation.html +++ b/Documentation.html @@ -1648,8 +1648,9 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> <dt id="cfg_DefaultLang">$cfg['DefaultLang'] string</dt> <dd>Defines the default language to use, if not browser-defined or user-defined.<br /> - See the <i>select_lang.lib.php</i> script to know the valid values for - this setting.</dd> + The corresponding language file needs to be in + locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo. + </dd>

<dt id="cfg_DefaultConnectionCollation">$cfg['DefaultConnectionCollation'] string</dt> <dd>Defines the default connection collation to use, if not @@ -1658,8 +1659,9 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre> documentation</a> for list of possible values.</dd>

<dt id="cfg_Lang">$cfg['Lang'] string</dt> - <dd>Force: always use this language (must be defined in the - <i>select_lang.lib.php</i> script).</dd> + <dd>Force language to use.<br /> + The corresponding language file needs to be in + locale/<i>code</i>/LC_MESSAGES/phpmyadmin.mo.

<dt id="cfg_FilterLanguages">$cfg['FilterLanguages'] string</dt> <dd>Limit list of available languages to those matching the given regular

hooks/post-receive