Git
Threads by month
- ----- 2026 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- 4 participants
- 39505 discussions
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5818-g43d5ad3
by Michal Čihař 21 Jul '10
by Michal Čihař 21 Jul '10
21 Jul '10
The branch, master has been updated
via 43d5ad370af8b77f80e698e81d82d18672370257 (commit)
from f5aa40b02f3cb363256f2983a092ede845c305de (commit)
- Log -----------------------------------------------------------------
commit 43d5ad370af8b77f80e698e81d82d18672370257
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 13:35:43 2010 +0200
Use real version when talking to validator.
-----------------------------------------------------------------------
Summary of changes:
libraries/sqlvalidator.class.php | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php
index 0a70158..5a44c2b 100644
--- a/libraries/sqlvalidator.class.php
+++ b/libraries/sqlvalidator.class.php
@@ -222,7 +222,7 @@ if (!$GLOBALS['sqlvalidator_error']) {
$this->username = 'anonymous';
$this->password = '';
$this->calling_program = 'PHP_SQLValidator';
- $this->calling_program_version = '$Revision$';
+ $this->calling_program_version = PMA_VERSION;
$this->target_dbms = 'N/A';
$this->target_dbms_version = 'N/A';
$this->connection_technology = 'PHP';
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5817-gf5aa40b
by Michal Čihař 21 Jul '10
by Michal Čihař 21 Jul '10
21 Jul '10
The branch, master has been updated
via f5aa40b02f3cb363256f2983a092ede845c305de (commit)
from ec18488499312fb3d4a3678f52c8aed77a35662c (commit)
- Log -----------------------------------------------------------------
commit f5aa40b02f3cb363256f2983a092ede845c305de
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 13:32:26 2010 +0200
Catch error when connection to validator service fails.
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index a8c32fc..61bb709 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1130,7 +1130,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
if (! empty($GLOBALS['show_as_php'])) {
$query_base = '$sql = "' . $query_base;
} elseif (! empty($GLOBALS['validatequery'])) {
- $query_base = PMA_validateSQL($query_base);
+ try {
+ $query_base = PMA_validateSQL($query_base);
+ } catch (Exception $e) {
+ PMA_Message::error(__('Failed to connect to SQL validator!'))->display();
+ }
} elseif (isset($parsed_sql)) {
$query_base = PMA_formatSql($parsed_sql, $query_base);
}
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5816-gec18488
by Michal Čihař 21 Jul '10
by Michal Čihař 21 Jul '10
21 Jul '10
The branch, master has been updated
via ec18488499312fb3d4a3678f52c8aed77a35662c (commit)
via 49a3bf45b7cbe158ed3d6fe3956870c61ca1f0aa (commit)
via 7d9bdc4754177450d96dd327b91f3fe1d00e68ae (commit)
from 1faec011d012ba37af49965a87840c071f75a4d1 (commit)
- Log -----------------------------------------------------------------
commit ec18488499312fb3d4a3678f52c8aed77a35662c
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 13:20:58 2010 +0200
Fix documentation.
commit 49a3bf45b7cbe158ed3d6fe3956870c61ca1f0aa
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 13:20:29 2010 +0200
Coding style.
commit 7d9bdc4754177450d96dd327b91f3fe1d00e68ae
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 13:19:19 2010 +0200
Make sure sqlvalidator_error is always defined.
-----------------------------------------------------------------------
Summary of changes:
libraries/sqlvalidator.class.php | 21 +++++++++++++++++++--
libraries/sqlvalidator.lib.php | 4 ++--
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php
index 0f9a6f3..0a70158 100644
--- a/libraries/sqlvalidator.class.php
+++ b/libraries/sqlvalidator.class.php
@@ -34,11 +34,13 @@ if (! defined('PHPMYADMIN')) {
* Load SOAP client.
*/
if (class_exists('SOAPClient')) {
+ $GLOBALS['sqlvalidator_error'] = false;
$GLOBALS['sqlvalidator_soap'] = 'PHP';
} else {
@include_once 'SOAP/Client.php';
if (class_exists('SOAP_Client')) {
$GLOBALS['sqlvalidator_soap'] = 'PEAR';
+ $GLOBALS['sqlvalidator_error'] = false;
} else {
$GLOBALS['sqlvalidator_soap'] = 'NONE';
$GLOBALS['sqlvalidator_error'] = TRUE;
@@ -121,7 +123,17 @@ if (!$GLOBALS['sqlvalidator_error']) {
$connection_technology, $connection_technology_version,
$interactive)
{
- $use_array = array("a_userName" => $username, "a_password" => $password, "a_callingProgram" => $calling_program, "a_callingProgramVersion" => $calling_program_version, "a_targetDbms" => $target_dbms, "a_targetDbmsVersion" => $target_dbms_version, "a_connectionTechnology" => $connection_technology, "a_connectionTechnologyVersion" => $connection_technology_version, "a_interactive" => $interactive);
+ $use_array = array(
+ "a_userName" => $username,
+ "a_password" => $password,
+ "a_callingProgram" => $calling_program,
+ "a_callingProgramVersion" => $calling_program_version,
+ "a_targetDbms" => $target_dbms,
+ "a_targetDbmsVersion" => $target_dbms_version,
+ "a_connectionTechnology" => $connection_technology,
+ "a_connectionTechnologyVersion" => $connection_technology_version,
+ "a_interactive" => $interactive,
+ );
if ($GLOBALS['sqlvalidator_soap'] == 'PHP') {
$ret = $obj->__soapCall("openSession", $use_array);
} else {
@@ -153,7 +165,12 @@ if (!$GLOBALS['sqlvalidator_error']) {
*/
function _validateSQL($obj, $session, $sql, $method)
{
- $use_array = array("a_sessionId" => $session->sessionId, "a_sessionKey" => $session->sessionKey, "a_SQL" => $sql, "a_resultType" => $this->output_type);
+ $use_array = array(
+ "a_sessionId" => $session->sessionId,
+ "a_sessionKey" => $session->sessionKey,
+ "a_SQL" => $sql,
+ "a_resultType" => $this->output_type,
+ );
if ($GLOBALS['sqlvalidator_soap'] == 'PHP') {
$res = $obj->__soapCall("validateSQL", $use_array);
} else {
diff --git a/libraries/sqlvalidator.lib.php b/libraries/sqlvalidator.lib.php
index 2e965f8..aaa79c0 100644
--- a/libraries/sqlvalidator.lib.php
+++ b/libraries/sqlvalidator.lib.php
@@ -22,8 +22,8 @@
* run this: "pear install Mail_Mime Net_DIME SOAP"
*
* Enable the SQL Validator options in the configuration file
- * $cfg['SQLQuery']['Validate'] = TRUE;
- * $cfg['SQLValidator']['use'] = FALSE;
+ * $cfg['SQLQuery']['Validate'] = true;
+ * $cfg['SQLValidator']['use'] = true;
*
* Also set a username and password if you have a private one
*
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5813-g1faec01
by Michal Čihař 21 Jul '10
by Michal Čihař 21 Jul '10
21 Jul '10
The branch, master has been updated
via 1faec011d012ba37af49965a87840c071f75a4d1 (commit)
from bc4dc6b9bd6c8e53b12043a7f5d16cbe97a6330e (commit)
- Log -----------------------------------------------------------------
commit 1faec011d012ba37af49965a87840c071f75a4d1
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 13:17:15 2010 +0200
SQL validator works also with SOAP PHP extension.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
Documentation.html | 1 +
libraries/sqlvalidator.class.php | 39 +++++++++++++++++++++++++++++--------
3 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1b48497..165e091 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -93,6 +93,7 @@ $Id$
navigation.
+ [code] Centralized format string expansion, @VARIABLES@ are recommended way
now.
++ [validator] SQL validator works also with SOAP PHP extension.
3.3.6.0 (not yet released)
- bug #3031705 [core] Do not use CONCAT for DECIMAL fields.
diff --git a/Documentation.html b/Documentation.html
index 7574c09..f76f33c 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -4112,6 +4112,7 @@ INSERT INTO REL_towns VALUES ('M', 'Montréal');
<abbr title="Extensible Markup Language">XML</abbr>,
<abbr title="Perl Compatible Regular Expressions">PCRE</abbr> and
<abbr title="PHP Extension and Application Repository">PEAR</abbr> support.
+ You either need a SOAP PHP extension or install PEAR SOAP module.
On your system command line, run <tt>"pear install Net_Socket Net_URL
HTTP_Request Mail_Mime Net_DIME SOAP"</tt> to get the necessary
<abbr title="PHP Extension and Application Repository">PEAR</abbr> modules
diff --git a/libraries/sqlvalidator.class.php b/libraries/sqlvalidator.class.php
index 3b6847c..0f9a6f3 100644
--- a/libraries/sqlvalidator.class.php
+++ b/libraries/sqlvalidator.class.php
@@ -7,9 +7,9 @@
* http://www.orbis-terrarum.net/?l=people.robbat2
*
* All data is transported over HTTP-SOAP
- * And uses the PEAR SOAP Module
+ * And uses either the PEAR SOAP Module or PHP SOAP extension
*
- * Install instructions for PEAR SOAP
+ * Install instructions for PEAR SOAP:
* Make sure you have a really recent PHP with PEAR support
* run this: "pear install Mail_Mime Net_DIME SOAP"
*
@@ -33,11 +33,20 @@ if (! defined('PHPMYADMIN')) {
/**
* Load SOAP client.
*/
-@include_once 'SOAP/Client.php';
-
-if (!function_exists('class_exists') || !class_exists('SOAP_Client')) {
- $GLOBALS['sqlvalidator_error'] = TRUE;
+if (class_exists('SOAPClient')) {
+ $GLOBALS['sqlvalidator_soap'] = 'PHP';
} else {
+ @include_once 'SOAP/Client.php';
+ if (class_exists('SOAP_Client')) {
+ $GLOBALS['sqlvalidator_soap'] = 'PEAR';
+ } else {
+ $GLOBALS['sqlvalidator_soap'] = 'NONE';
+ $GLOBALS['sqlvalidator_error'] = TRUE;
+ PMA_warnMissingExtension('soap');
+ }
+}
+
+if (!$GLOBALS['sqlvalidator_error']) {
// Ok, we have SOAP Support, so let's use it!
/**
@@ -79,7 +88,11 @@ if (!function_exists('class_exists') || !class_exists('SOAP_Client')) {
*/
function _openService($url)
{
- $obj = new SOAP_Client($url, TRUE);
+ if ($GLOBALS['sqlvalidator_soap'] == 'PHP') {
+ $obj = new SOAPClient($url);
+ } else {
+ $obj = new SOAP_Client($url, TRUE);
+ }
return $obj;
} // end of the "openService()" function
@@ -109,7 +122,11 @@ if (!function_exists('class_exists') || !class_exists('SOAP_Client')) {
$interactive)
{
$use_array = array("a_userName" => $username, "a_password" => $password, "a_callingProgram" => $calling_program, "a_callingProgramVersion" => $calling_program_version, "a_targetDbms" => $target_dbms, "a_targetDbmsVersion" => $target_dbms_version, "a_connectionTechnology" => $connection_technology, "a_connectionTechnologyVersion" => $connection_technology_version, "a_interactive" => $interactive);
- $ret = $obj->call("openSession", $use_array);
+ if ($GLOBALS['sqlvalidator_soap'] == 'PHP') {
+ $ret = $obj->__soapCall("openSession", $use_array);
+ } else {
+ $ret = $obj->call("openSession", $use_array);
+ }
// This is the old version that needed the overload extension
/* $ret = $obj->openSession($username, $password,
@@ -137,7 +154,11 @@ if (!function_exists('class_exists') || !class_exists('SOAP_Client')) {
function _validateSQL($obj, $session, $sql, $method)
{
$use_array = array("a_sessionId" => $session->sessionId, "a_sessionKey" => $session->sessionKey, "a_SQL" => $sql, "a_resultType" => $this->output_type);
- $res = $obj->call("validateSQL", $use_array);
+ if ($GLOBALS['sqlvalidator_soap'] == 'PHP') {
+ $res = $obj->__soapCall("validateSQL", $use_array);
+ } else {
+ $res = $obj->call("validateSQL", $use_array);
+ }
// This is the old version that needed the overload extension
// $res = $obj->validateSQL($session->sessionId, $session->sessionKey, $sql, $this->output_type);
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5809-g709c97d
by Michal Čihař 21 Jul '10
by Michal Čihař 21 Jul '10
21 Jul '10
The branch, master has been updated
via 709c97dee355421046069a6cc550017b671f7e64 (commit)
from e5e340e525f51a318def41e087301b015c661ff1 (commit)
- Log -----------------------------------------------------------------
commit 709c97dee355421046069a6cc550017b671f7e64
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 10:17:35 2010 +0200
Chagelog update.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 7c075c2..1b48497 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -91,6 +91,8 @@ $Id$
+ [core] Dropped AllowAnywhereRecoding configuration variable.
- rfe #3016457 [interface] Define tab order in SQL form to allow easier tab
navigation.
++ [code] Centralized format string expansion, @VARIABLES@ are recommended way
+ now.
3.3.6.0 (not yet released)
- bug #3031705 [core] Do not use CONCAT for DECIMAL fields.
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5808-ge5e340e
by Michal Čihař 21 Jul '10
by Michal Čihař 21 Jul '10
21 Jul '10
The branch, master has been updated
via e5e340e525f51a318def41e087301b015c661ff1 (commit)
via cb6716c4814ba7e8031ea2a0a5f5a8d7ab78068d (commit)
via b1cf628bd7809c58af73391f3b9949f89c11a386 (commit)
via 38171b9e239d68b4116d08ef46749a554a32e485 (commit)
via 7a788a52b9931c317611b3c14b8795a999cc736a (commit)
via 906d7bc6325cd9b186db6eb24c4252e27c9aa8fe (commit)
via dba7151245ac841a02a6733eef3f05c00d9d3794 (commit)
via 2040be9611832190e07c001e19b8755c13399589 (commit)
via 9b2aa3c40d65d40a293c433dc581f0aa0c2bc354 (commit)
via 715f2f04f6170265d2ea9f9d0b507bc4dae40557 (commit)
via 7415caa4e4cbc576b9425cb96a04c0928307e8fb (commit)
via 32910a9b285eac3ab7d6d3a52c26757019bf9570 (commit)
via b24a566ebaa1b73944c23703cae00b56447ad049 (commit)
from 40aaa768dd3529b05563f7c0193c1a70661574fd (commit)
- Log -----------------------------------------------------------------
commit e5e340e525f51a318def41e087301b015c661ff1
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 10:16:30 2010 +0200
Proper propagating of overrided values.
commit cb6716c4814ba7e8031ea2a0a5f5a8d7ab78068d
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 10:11:35 2010 +0200
Documentation in LaTeX format strings.
commit b1cf628bd7809c58af73391f3b9949f89c11a386
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 10:10:06 2010 +0200
Support for phpMyAdmin documentation in plugin library.
commit 38171b9e239d68b4116d08ef46749a554a32e485
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 10:08:48 2010 +0200
Move documentation link to better place.
commit 7a788a52b9931c317611b3c14b8795a999cc736a
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 10:07:03 2010 +0200
Document why __VAR__ is there.
commit 906d7bc6325cd9b186db6eb24c4252e27c9aa8fe
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 10:06:16 2010 +0200
By default use new format strings.
commit dba7151245ac841a02a6733eef3f05c00d9d3794
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 10:05:55 2010 +0200
Document new format strings.
commit 2040be9611832190e07c001e19b8755c13399589
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 09:56:05 2010 +0200
Documentation.
commit 9b2aa3c40d65d40a293c433dc581f0aa0c2bc354
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 09:55:13 2010 +0200
Indentation.
commit 715f2f04f6170265d2ea9f9d0b507bc4dae40557
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 09:54:04 2010 +0200
Move messages to place where they are used.
commit 7415caa4e4cbc576b9425cb96a04c0928307e8fb
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 09:51:24 2010 +0200
LaTeX export uses PMA_expandUserString.
commit 32910a9b285eac3ab7d6d3a52c26757019bf9570
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 09:43:38 2010 +0200
Cleanup in PMA_expandUserString.
commit b24a566ebaa1b73944c23703cae00b56447ad049
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 09:36:28 2010 +0200
Export uses same expanding as title.
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 47 +++++++++++++++---------
export.php | 4 +--
libraries/common.lib.php | 69 ++++++++++++++++++++++++-----------
libraries/config.default.php | 10 +++---
libraries/display_export.lib.php | 7 ++--
libraries/export/latex.php | 47 +++++++++++++-----------
libraries/plugin_interface.lib.php | 2 +
libraries/select_lang.lib.php | 4 --
8 files changed, 114 insertions(+), 76 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 67f9ff1..7574c09 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2150,24 +2150,8 @@ setfacl -d -m "g:www-data:rwx" tmp
<dt id="cfg_TitleDatabase">$cfg['TitleDatabase'] string</dt>
<dt id="cfg_TitleServer">$cfg['TitleServer'] string</dt>
<dt id="cfg_TitleDefault">$cfg['TitleDefault'] string</dt>
- <dd>Allows you to specify window's title bar. Following magic string can
- be used to get special values:
- <dl>
- <dt><code>@HTTP_HOST@</code></dt>
- <dd>HTTP host that runs phpMyAdmin</dd>
- <dt><code>@SERVER@</code></dt>
- <dd>MySQL server name</dd>
- <dt><code>@VERBOSE@</code></dt>
- <dd>Verbose MySQL server name as defined in <a href="#cfg_Servers_verbose">server configuration</a></dd>
- <dt><code>@VSERVER@</code></dt>
- <dd>Verbose MySQL server name if set, otherwise normal</dd>
- <dt><code>@DATABASE@</code></dt>
- <dd>Currently opened database</dd>
- <dt><code>@TABLE@</code></dt>
- <dd>Currently opened table</dd>
- <dt><code>@PHPMYADMIN@</code></dt>
- <dd>phpMyAdmin with version</dd>
- </dl>
+ <dd>Allows you to specify window's title bar. You can use
+ <a href="#faq6_27">format string expansion</a>.
</dd>
<dt id="cfg_ErrorIconic">$cfg['ErrorIconic'] boolean</dt>
@@ -4330,6 +4314,33 @@ chmod o+rwx tmp
<p> Click the first row of the range, hold the shift key and click the last row of the range. This works everywhere you see rows, for example in Browse mode or on the Structure page.</p>
+<h4 id="faq6_27">
+ <a href="#faq6_27">6.27 What format strings can I use?</a></h4>
+
+<p>
+ In all places where phpMyAdmin accepts format strings, you can use
+ <code>@VARIABLE@</code> expansion and
+ <a href="http://php.net/strftime">strftime</a> format strings. The
+ expanded variables depend on a context (eg. if you don't have chosen
+ table, you can not get table name), but following variables can be used:
+</p>
+<dl>
+ <dt><code>@HTTP_HOST@</code></dt>
+ <dd>HTTP host that runs phpMyAdmin</dd>
+ <dt><code>@SERVER@</code></dt>
+ <dd>MySQL server name</dd>
+ <dt><code>@VERBOSE@</code></dt>
+ <dd>Verbose MySQL server name as defined in <a href="#cfg_Servers_verbose">server configuration</a></dd>
+ <dt><code>@VSERVER@</code></dt>
+ <dd>Verbose MySQL server name if set, otherwise normal</dd>
+ <dt><code>@DATABASE@</code></dt>
+ <dd>Currently opened database</dd>
+ <dt><code>@TABLE@</code></dt>
+ <dd>Currently opened table</dd>
+ <dt><code>@PHPMYADMIN@</code></dt>
+ <dd>phpMyAdmin with version</dd>
+</dl>
+
<h3 id="faqproject">phpMyAdmin project</h3>
<h4 id="faq7_1">
diff --git a/export.php b/export.php
index 43c37ce..2db992d 100644
--- a/export.php
+++ b/export.php
@@ -247,18 +247,16 @@ if ($asfile) {
if (isset($remember_template)) {
$GLOBALS['PMA_Config']->setCookie('pma_server_filename_template', $filename_template);
}
- $filename = str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template));
} elseif ($export_type == 'database') {
if (isset($remember_template)) {
$GLOBALS['PMA_Config']->setCookie('pma_db_filename_template', $filename_template);
}
- $filename = str_replace('__DB__', $db, str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template)));
} else {
if (isset($remember_template)) {
$GLOBALS['PMA_Config']->setCookie('pma_table_filename_template', $filename_template);
}
- $filename = str_replace('__TABLE__', $table, str_replace('__DB__', $db, str_replace('__SERVER__', $GLOBALS['cfg']['Server']['host'], strftime($filename_template))));
}
+ $filename = PMA_expandUserString($filename_template);
// convert filename to iso-8859-1, it is safer
$filename = PMA_convert_string($charset, 'iso-8859-1', $filename);
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index e2af6d9..a8c32fc 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2828,28 +2828,53 @@ $mapping = array(
}
/**
- * Formats user string, expading @VARIABLES@.
+ * Formats user string, expading @VARIABLES@, accepting strftime format string.
+ *
+ * @param string Text where to do expansion.
+ * @param function Function to call for escaping variable values.
+ * @param array Array with overrides for default parameters (obtained from GLOBALS).
*/
-function PMA_expandUserString($string) {
- return str_replace(
- array(
- '@HTTP_HOST@',
- '@SERVER@',
- '@VERBOSE@',
- '@VSERVER@',
- '@DATABASE@',
- '@TABLE@',
- '@PHPMYADMIN@',
- ),
- array(
- PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '',
- $GLOBALS['cfg']['Server']['host'],
- $GLOBALS['cfg']['Server']['verbose'],
- !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host'],
- $GLOBALS['db'],
- $GLOBALS['table'],
- 'phpMyAdmin ' . PMA_VERSION,
- ),
- $string);
+function PMA_expandUserString($string, $escape = NULL, $updates = array()) {
+ /* Content */
+ $vars['http_host'] = PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '';
+ $vars['server_name'] = $GLOBALS['cfg']['Server']['host'];
+ $vars['server_verbose'] = $GLOBALS['cfg']['Server']['verbose'];
+ $vars['server_verbose_or_name'] = !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host'];
+ $vars['database'] = $GLOBALS['db'];
+ $vars['table'] = $GLOBALS['table'];
+ $vars['phpmyadmin_version'] = 'phpMyAdmin ' . PMA_VERSION;
+
+ /* Update forced variables */
+ foreach($updates as $key => $val) {
+ $vars[$key] = $val;
+ }
+
+ /* Replacement mapping */
+ /*
+ * The __VAR__ ones are for backward compatibility, because user
+ * might still have it in cookies.
+ */
+ $replace = array(
+ '@HTTP_HOST@' => $vars['http_host'],
+ '@SERVER@' => $vars['server_name'],
+ '__SERVER__' => $vars['server_name'],
+ '@VERBOSE@' => $vars['server_verbose'],
+ '@VSERVER@' => $vars['server_verbose_or_name'],
+ '@DATABASE@' => $vars['database'],
+ '__DB__' => $vars['database'],
+ '@TABLE@' => $vars['table'],
+ '__TABLE__' => $vars['table'],
+ '@PHPMYADMIN@' => $vars['phpmyadmin_version'],
+ );
+
+ /* Optional escaping */
+ if (!is_null($escape)) {
+ foreach($replace as $key => $val) {
+ $replace[$key] = $escape($val);
+ }
+ }
+
+ /* Do the replacement */
+ return str_replace(array_keys($replace), array_values($replace), strftime($string));
}
?>
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 4b6bd96..7ec7c5d 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -1116,21 +1116,21 @@ $cfg['Export']['remember_file_template'] = true;
*
* @global string $cfg['Export']['file_template_table']
*/
-$cfg['Export']['file_template_table'] = '__TABLE__';
+$cfg['Export']['file_template_table'] = '@TABLE@';
/**
*
*
* @global string $cfg['Export']['file_template_database']
*/
-$cfg['Export']['file_template_database'] = '__DB__';
+$cfg['Export']['file_template_database'] = '@DB@';
/**
*
*
* @global string $cfg['Export']['file_template_server']
*/
-$cfg['Export']['file_template_server'] = '__SERVER__';
+$cfg['Export']['file_template_server'] = '@SERVER@';
/**
*
@@ -1431,14 +1431,14 @@ $cfg['Export']['latex_data_continued_caption'] = 'strLatexContent strLatexContin
*
* @global string $cfg['Export']['latex_data_label']
*/
-$cfg['Export']['latex_data_label'] = 'tab:__TABLE__-data';
+$cfg['Export']['latex_data_label'] = 'tab:@TABLE@-data';
/**
*
*
* @global string $cfg['Export']['latex_structure_label']
*/
-$cfg['Export']['latex_structure_label'] = 'tab:__TABLE__-structure';
+$cfg['Export']['latex_structure_label'] = 'tab:@TABLE@-structure';
/**
*
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index ae099e0..afa6435 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -147,13 +147,13 @@ echo PMA_pluginGetJavascript($export_list);
echo __('File name template');
$trans = new PMA_Message;
- $trans->addMessage('__SERVER__/');
+ $trans->addMessage('@SERVER@/');
$trans->addString(__('server name'));
if ($export_type == 'database' || $export_type == 'table') {
- $trans->addMessage('__DB__/');
+ $trans->addMessage('@DB@/');
$trans->addString(__('database name'));
if ($export_type == 'table') {
- $trans->addMessage('__TABLE__/');
+ $trans->addMessage('@TABLE@/');
$trans->addString(__('table name'));
}
}
@@ -193,6 +193,7 @@ echo PMA_pluginGetJavascript($export_list);
?>
/>
+ <?php echo PMA_showDocu('faq6_27'); ?>
(
<input type="checkbox" name="remember_template"
id="checkbox_remember_template"
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index ccf87e9..056b69f 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -9,6 +9,11 @@ if (! defined('PHPMYADMIN')) {
exit;
}
+/* Messages used in default captions */
+$GLOBALS['strLatexContent'] = __('Content of table @TABLE@');
+$GLOBALS['strLatexContinued'] = __('(continued)');
+$GLOBALS['strLatexStructure'] = __('Structure of table @TABLE@');
+
/**
*
*/
@@ -31,11 +36,11 @@ if (isset($plugin_list)) {
$plugin_list['latex']['options'][] =
array('type' => 'bgroup', 'name' => 'structure', 'text' => __('Structure'), 'force' => 'data');
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption'));
+ array('type' => 'text', 'name' => 'structure_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27');
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Continued table caption'));
+ array('type' => 'text', 'name' => 'structure_continued_caption', 'text' => __('Continued table caption'), 'doc' => 'faq6_27');
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key'));
+ array('type' => 'text', 'name' => 'structure_label', 'text' => __('Label key'), 'doc' => 'faq6_27');
if (!empty($GLOBALS['cfgRelation']['relation'])) {
$plugin_list['latex']['options'][] =
array('type' => 'bool', 'name' => 'relation', 'text' => __('Relations'));
@@ -55,11 +60,11 @@ if (isset($plugin_list)) {
$plugin_list['latex']['options'][] =
array('type' => 'bool', 'name' => 'columns', 'text' => __('Put columns names in the first row'));
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption'));
+ array('type' => 'text', 'name' => 'data_caption', 'text' => __('Table caption'), 'doc' => 'faq6_27');
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Continued table caption'));
+ array('type' => 'text', 'name' => 'data_continued_caption', 'text' => __('Continued table caption'), 'doc' => 'faq6_27');
$plugin_list['latex']['options'][] =
- array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key'));
+ array('type' => 'text', 'name' => 'data_label', 'text' => __('Label key'), 'doc' => 'faq6_27');
$plugin_list['latex']['options'][] =
array('type' => 'text', 'name' => 'null', 'text' => __('Replace NULL by'));
$plugin_list['latex']['options'][] =
@@ -76,12 +81,12 @@ if (isset($plugin_list)) {
* @access private
*/
function PMA_texEscape($string) {
- $escape = array('$', '%', '{', '}', '&', '#', '_', '^');
- $cnt_escape = count($escape);
- for ($k=0; $k < $cnt_escape; $k++) {
- $string = str_replace($escape[$k], '\\' . $escape[$k], $string);
- }
- return $string;
+ $escape = array('$', '%', '{', '}', '&', '#', '_', '^');
+ $cnt_escape = count($escape);
+ for ($k=0; $k < $cnt_escape; $k++) {
+ $string = str_replace($escape[$k], '\\' . $escape[$k], $string);
+ }
+ return $string;
}
/**
@@ -207,8 +212,8 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
$buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf;
if (isset($GLOBALS['latex_caption'])) {
- $buffer .= ' \\caption{' . str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_data_caption'])
- . '} \\label{' . str_replace('__TABLE__', $table, $GLOBALS['latex_data_label']) . '} \\\\';
+ $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
+ . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\';
}
if (!PMA_exportOutputHandler($buffer)) {
return FALSE;
@@ -226,7 +231,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
return FALSE;
}
if (isset($GLOBALS['latex_caption'])) {
- if (!PMA_exportOutputHandler('\\caption{' . str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_data_continued_caption']) . '} \\\\ ')) return FALSE;
+ if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ')) return FALSE;
}
if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) {
return FALSE;
@@ -289,7 +294,7 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
*
* @access public
*/
- // @@@ Table structure
+ // @@@ Table structure
function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $dummy)
{
global $cfgRelation;
@@ -373,14 +378,14 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
// Table caption for first page and label
if (isset($GLOBALS['latex_caption'])) {
- $buffer .= ' \\caption{'. str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_structure_caption'])
- . '} \\label{' . str_replace('__TABLE__', $table, $GLOBALS['latex_structure_label'])
+ $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
+ . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], NULL, array('table' => $table, 'database' => $db))
. '} \\\\' . $crlf;
}
$buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf;
// Table caption on next pages
if (isset($GLOBALS['latex_caption'])) {
- $buffer .= ' \\caption{'. str_replace('__TABLE__', PMA_texEscape($table), $GLOBALS['latex_structure_continued_caption'])
+ $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
. '} \\\\ ' . $crlf;
}
$buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf;
@@ -425,8 +430,8 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals
$field_name = $row['Field'];
- $local_buffer = $field_name . "\000" . $type . "\000"
- . (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'))
+ $local_buffer = $field_name . "\000" . $type . "\000"
+ . (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'))
. "\000" . (isset($row['Default']) ? $row['Default'] : '');
if ($do_relation && $have_rel) {
diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index da52b83..b2c441b 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -274,6 +274,8 @@ function PMA_pluginGetOneOption($section, $plugin_name, $id, &$opt)
if (isset($opt['doc'])) {
if (count($opt['doc']) == 3) {
$ret .= PMA_showMySQLDocu($opt['doc'][0], $opt['doc'][1], false, $opt['doc'][2]);
+ } elseif (count($opt['doc']) == 1) {
+ $ret .= PMA_showDocu($opt['doc'][0]);
} else {
$ret .= PMA_showMySQLDocu($opt['doc'][0], $opt['doc'][1]);
}
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index f750d81..ca8c7cc 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -480,10 +480,6 @@ $charset = 'utf-8';
/* l10n: Text direction, use either ltr or rtl */
$text_dir = __('ltr');
-$strLatexContent = __('Content of table __TABLE__');
-$strLatexContinued = __('(continued)');
-$strLatexStructure = __('Structure of table __TABLE__');
-
// now, that we have loaded the language strings we can send the errors
if ($GLOBALS['lang_failed_cfg']) {
trigger_error(
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5795-g40aaa76
by Michal Čihař 21 Jul '10
by Michal Čihař 21 Jul '10
21 Jul '10
The branch, master has been updated
via 40aaa768dd3529b05563f7c0193c1a70661574fd (commit)
via ce9e7a94629b6b07d33f70b4f412ab4dd04ebcd8 (commit)
from eeae8bec2159e2be2b25cf704fa25d1ac1d33c33 (commit)
- Log -----------------------------------------------------------------
commit 40aaa768dd3529b05563f7c0193c1a70661574fd
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 09:30:31 2010 +0200
Factor out variable expanding.
commit ce9e7a94629b6b07d33f70b4f412ab4dd04ebcd8
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 09:26:00 2010 +0200
Not used anywhere.
-----------------------------------------------------------------------
Summary of changes:
libraries/common.lib.php | 38 ++++++++++++++++++++++++--------------
libraries/header_scripts.inc.php | 20 +-------------------
2 files changed, 25 insertions(+), 33 deletions(-)
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 3302658..e2af6d9 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2827,19 +2827,29 @@ $mapping = array(
return $mapping[$target];
}
-function PMA_js($code, $print=true)
-{
- // these generated newlines are needed
- $out = '';
- $out .= '<script type="text/javascript">'."\n";
- $out .= "\n" . '// <![CDATA[' . "\n";
- $out .= $code;
- $out .= "\n" . '// ]]>' . "\n";
- $out .= '</script>'."\n";
-
- if ($print)
- echo $out;
-
- return $out;
+/**
+ * Formats user string, expading @VARIABLES@.
+ */
+function PMA_expandUserString($string) {
+ return str_replace(
+ array(
+ '@HTTP_HOST@',
+ '@SERVER@',
+ '@VERBOSE@',
+ '@VSERVER@',
+ '@DATABASE@',
+ '@TABLE@',
+ '@PHPMYADMIN@',
+ ),
+ array(
+ PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '',
+ $GLOBALS['cfg']['Server']['host'],
+ $GLOBALS['cfg']['Server']['verbose'],
+ !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : $GLOBALS['cfg']['Server']['host'],
+ $GLOBALS['db'],
+ $GLOBALS['table'],
+ 'phpMyAdmin ' . PMA_VERSION,
+ ),
+ $string);
}
?>
diff --git a/libraries/header_scripts.inc.php b/libraries/header_scripts.inc.php
index 3463309..a292d0f 100644
--- a/libraries/header_scripts.inc.php
+++ b/libraries/header_scripts.inc.php
@@ -21,25 +21,7 @@ if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) {
<?php
}
// generate title
-$title = str_replace(
- array(
- '@HTTP_HOST@',
- '@SERVER@',
- '@VERBOSE@',
- '@VSERVER@',
- '@DATABASE@',
- '@TABLE@',
- '@PHPMYADMIN@',
- ),
- array(
- PMA_getenv('HTTP_HOST') ? PMA_getenv('HTTP_HOST') : '',
- isset($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['Server']['host'] : '',
- isset($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : '',
- !empty($GLOBALS['cfg']['Server']['verbose']) ? $GLOBALS['cfg']['Server']['verbose'] : (isset($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['Server']['host'] : ''),
- $GLOBALS['db'],
- $GLOBALS['table'],
- 'phpMyAdmin ' . PMA_VERSION,
- ),
+$title = PMA_expandUserString(
!empty($GLOBALS['table']) ? $GLOBALS['cfg']['TitleTable'] :
(!empty($GLOBALS['db']) ? $GLOBALS['cfg']['TitleDatabase'] :
(!empty($GLOBALS['cfg']['Server']['host']) ? $GLOBALS['cfg']['TitleServer'] :
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5793-geeae8be
by Michal Čihař 21 Jul '10
by Michal Čihař 21 Jul '10
21 Jul '10
The branch, master has been updated
via eeae8bec2159e2be2b25cf704fa25d1ac1d33c33 (commit)
from 5908ab72bca63e9efb326e8148c1f8f0fb285de6 (commit)
- Log -----------------------------------------------------------------
commit eeae8bec2159e2be2b25cf704fa25d1ac1d33c33
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 09:21:58 2010 +0200
Get rid of inline javascript in login form.
-----------------------------------------------------------------------
Summary of changes:
js/functions.js | 7 +++++++
libraries/auth/cookie.auth.lib.php | 30 +++++++-----------------------
2 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/js/functions.js b/js/functions.js
index e5d8363..b5995f0 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -1726,5 +1726,12 @@ $(document).ready(function(){
return false;
});
$('#sqlquery').focus();
+ if ($('#input_username')) {
+ if ($('#input_username').val() == '') {
+ $('#input_username').focus();
+ } else {
+ $('#input_password').focus();
+ }
+ }
});
diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php
index b40f7a2..a964455 100644
--- a/libraries/auth/cookie.auth.lib.php
+++ b/libraries/auth/cookie.auth.lib.php
@@ -172,14 +172,14 @@ function PMA_auth()
?>
<script src="./js/jquery/jquery-1.4.2.js" type="text/javascript"></script>
<script src="./js/update-location.js" type="text/javascript"></script>
-<script type="text/javascript">
-//<![CDATA[
-// show login form in top frame
-if (top != self) {
- window.top.location.href=location;
+<?php
+if ( false === $GLOBALS['cfg']['AllowThirdPartyFraming']) {
+?>
+<script src="./js/cross_framing_protection.js" type="text/javascript"></script>
+<?php
}
-//]]>
-</script>
+?>
+<script src="./js/functions.js" type="text/javascript"></script>
</head>
<body class="loginform">
@@ -312,22 +312,6 @@ if (top != self) {
}
?>
</div>
-<script type="text/javascript">
-// <![CDATA[
-function PMA_focusInput()
-{
- var input_username = document.getElementById('input_username');
- var input_password = document.getElementById('input_password');
- if (input_username.value == '') {
- input_username.focus();
- } else {
- input_password.focus();
- }
-}
-
-window.setTimeout('PMA_focusInput()', 500);
-// ]]>
-</script>
<?php
if (file_exists(CUSTOM_FOOTER_FILE)) {
require CUSTOM_FOOTER_FILE;
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5792-g5908ab7
by Michal Čihař 21 Jul '10
by Michal Čihař 21 Jul '10
21 Jul '10
The branch, master has been updated
via 5908ab72bca63e9efb326e8148c1f8f0fb285de6 (commit)
from 85dd14612dd4afd296747d26752a0bc5607e116b (commit)
- Log -----------------------------------------------------------------
commit 5908ab72bca63e9efb326e8148c1f8f0fb285de6
Author: Michal Čihař <mcihar(a)novell.com>
Date: Wed Jul 21 09:07:59 2010 +0200
Clarify database upgrade instructions.
We don't want to maintain all new tables in upgrade script as well.
-----------------------------------------------------------------------
Summary of changes:
Documentation.html | 3 ++-
scripts/upgrade_tables_mysql_4_1_2+.sql | 19 -------------------
2 files changed, 2 insertions(+), 20 deletions(-)
diff --git a/Documentation.html b/Documentation.html
index 4c23ec6..67f9ff1 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -340,7 +340,8 @@ rm -rf config # remove not needed directory
<abbr title="Frequently Asked Questions">FAQ</abbr> 1.23</a>).</p>
<p> If you already had this infrastructure and upgraded to MySQL 4.1.2
- or newer, please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i>.</p>
+ or newer, please use <i>./scripts/upgrade_tables_mysql_4_1_2+.sql</i>
+ and then create new tables by importing <i>./scripts/create_tables.sql</i>.</p>
<p> You can use your phpMyAdmin to create the tables for you. Please be aware
that you may need special (administrator) privileges to create the database
diff --git a/scripts/upgrade_tables_mysql_4_1_2+.sql b/scripts/upgrade_tables_mysql_4_1_2+.sql
index 3ab0e74..1ff470e 100644
--- a/scripts/upgrade_tables_mysql_4_1_2+.sql
+++ b/scripts/upgrade_tables_mysql_4_1_2+.sql
@@ -143,22 +143,3 @@ ALTER TABLE `pma_table_info`
CHANGE `table_name` `table_name` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
ALTER TABLE `pma_table_info`
CHANGE `display_field` `display_field` VARCHAR(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '';
-
--- --------------------------------------------------------
-
---
--- Table structure for table `pma_designer_coords`
---
-
-CREATE TABLE IF NOT EXISTS `pma_designer_coords` (
- `db_name` varchar(64) NOT NULL default '',
- `table_name` varchar(64) NOT NULL default '',
- `x` INT,
- `y` INT,
- `v` TINYINT,
- `h` TINYINT,
- PRIMARY KEY (`db_name`,`table_name`)
-)
- ENGINE=MyISAM COMMENT='Table coordinates for Designer'
- DEFAULT CHARACTER SET utf8 COLLATE utf8_bin;
-
hooks/post-receive
--
phpMyAdmin
1
0
[Phpmyadmin-git] [SCM] phpMyAdmin localized documentation branch, master, updated. d7c0960d6cec1bc1c34f1a7d51257e2264ae70e0
by Michal Čihař 21 Jul '10
by Michal Čihař 21 Jul '10
21 Jul '10
The branch, master has been updated
via d7c0960d6cec1bc1c34f1a7d51257e2264ae70e0 (commit)
from 1d95aa0834ecb6bbf02ead138b6a1734251974c3 (commit)
- Log -----------------------------------------------------------------
commit d7c0960d6cec1bc1c34f1a7d51257e2264ae70e0
Author: Robert Readman <robert_readman(a)hotmail.com>
Date: Tue Jul 20 16:49:02 2010 +0200
Translation update done using Pootle.
-----------------------------------------------------------------------
Summary of changes:
po/en_GB.po | 470 ++++++++++++++++++++++++++---------------------------------
1 files changed, 207 insertions(+), 263 deletions(-)
diff --git a/po/en_GB.po b/po/en_GB.po
index 5689d0b..03ccde0 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -249,17 +249,15 @@ msgstr "Currently phpMyAdmin can:"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:104
-#, fuzzy
msgid "browse and drop databases, tables, views, columns and indexes"
-msgstr "browse and drop databases, tables, views, fields and indexes"
+msgstr "browse and drop databases, tables, views, columns and indexes"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:105
-#, fuzzy
msgid ""
"create, copy, drop, rename and alter databases, tables, columns and indexes"
msgstr ""
-"create, copy, drop, rename and alter databases, tables, fields and indexes"
+"create, copy, drop, rename and alter databases, tables, columns and indexes"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:107
@@ -854,7 +852,6 @@ msgstr "Linked-tables infrastructure"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:328
-#, fuzzy
msgid ""
"For a whole set of new features (bookmarks, comments, <abbr title="
"\"structured query language\">SQL</abbr>-history, tracking mechanism, <abbr "
@@ -864,12 +861,12 @@ msgid ""
"multi-user installation (this database would then be accessed by the "
"controluser, so no other user should have rights to it)."
msgstr ""
-"For a whole set of new features (bookmarks, comments, <abbr title="
-"\"structured query language\">SQL</abbr>-history, tracking mechanism, <abbr "
-"title=\"Portable Document Format\">PDF</abbr>-generation, field contents "
-"transformation, etc.) you need to create a set of special tables. Those "
-"tables can be located in your own database, or in a central database for a "
-"multi-user installation (this database would then be accessed by the "
+"For a whole set of new features (bookmarks, comments, <abbr "
+"title=\"structured query language\">SQL</abbr>-history, tracking mechanism, "
+"<abbr title=\"Portable Document Format\">PDF</abbr>-generation, column "
+"contents transformation, etc.) you need to create a set of special tables. "
+"Those tables can be located in your own database, or in a central database "
+"for a multi-user installation (this database would then be accessed by the "
"controluser, so no other user should have rights to it)."
#. type: Content of: <html><body><div><p>
@@ -1045,13 +1042,12 @@ msgstr ""
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:399
-#, fuzzy
msgid ""
"Note: this section is only applicable if your MySQL server is running with "
"<tt>--skip-show-database</tt>."
msgstr ""
-"Note: starting with phpMyAdmin 2.6.1, this section is only applicable if "
-"your MySQL server is running with <tt>--skip-show-database</tt>."
+"Note: this section is only applicable if your MySQL server is running with "
+"<tt>--skip-show-database</tt>."
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:402
@@ -1886,7 +1882,6 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:715
-#, fuzzy
msgid ""
"This special account is used for 2 distinct purposes: to make possible all "
"relational features (see <a href=\"#pmadb\" class=\"configrule\">$cfg"
@@ -1895,9 +1890,9 @@ msgid ""
"\"HyperText Transfer Protocol\">HTTP</abbr> or cookie authentication mode)."
msgstr ""
"This special account is used for 2 distinct purposes: to make possible all "
-"relational features (see <a href=\"#pmadb\" class=\"configrule\">$cfg"
-"['Servers'][$i]['pmadb']</a>) and, for a MySQL server previous to 4.1.2 or "
-"running with <tt>--skip-show-database</tt>, to enable a multi-user "
+"relational features (see <a href=\"#pmadb\" "
+"class=\"configrule\">$cfg['Servers'][$i]['pmadb']</a>) and, for a MySQL "
+"server running with <tt>--skip-show-database</tt>, to enable a multi-user "
"installation (<abbr title=\"HyperText Transfer Protocol\">HTTP</abbr> or "
"cookie authentication mode)."
@@ -2357,14 +2352,13 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:895
-#, fuzzy
msgid ""
"Since release 2.2.4 you can describe, in a special 'relation' table, which "
"column is a key in another table (a foreign key). phpMyAdmin currently uses "
"this to"
msgstr ""
"Since release 2.2.4 you can describe, in a special 'relation' table, which "
-"field is a key in another table (a foreign key). phpMyAdmin currently uses "
+"column is a key in another table (a foreign key). phpMyAdmin currently uses "
"this to"
#. type: Content of: <html><body><div><dl><dd><ul><li>
@@ -2378,15 +2372,14 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:900
-#, fuzzy
msgid ""
"display in an optional tool-tip the "display column" when browsing "
"the master table, if you move the mouse to a column containing a foreign key "
"(use also the 'table_info' table);"
msgstr ""
-"display in an optional tool-tip the "display field" when browsing "
-"the master table, if you move the mouse to a column containing a foreign key "
-"(use also the 'table_info' table);"
+"display in an optional tool-tip the "display column" when browsing "
+"the master table, if you move the mouse to a column containing a foreign "
+"key (use also the 'table_info' table);"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:903
@@ -2399,13 +2392,12 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:905
-#, fuzzy
msgid ""
"in edit/insert mode, display a drop-down list of possible foreign keys (key "
"value and "display column" are shown)"
msgstr ""
"in edit/insert mode, display a drop-down list of possible foreign keys (key "
-"value and "display field" are shown)"
+"value and "display column" are shown)"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:907
@@ -2456,7 +2448,6 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:926
-#, fuzzy
msgid ""
"now as normal user open phpMyAdmin and for each one of your tables where you "
"want to use this feature, click "Structure/Relation view/" and "
@@ -2464,19 +2455,18 @@ msgid ""
msgstr ""
"now as normal user open phpMyAdmin and for each one of your tables where you "
"want to use this feature, click "Structure/Relation view/" and "
-"choose foreign fields."
+"choose foreign columns."
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:933
-#, fuzzy
msgid ""
"Please note that in the current version, <tt>master_db</tt> must be the same "
"as <tt>foreign_db</tt>. Those columns have been put in future development of "
"the cross-db relations."
msgstr ""
"Please note that in the current version, <tt>master_db</tt> must be the same "
-"as <tt>foreign_db</tt>. Those fields have been put in future development of "
-"the cross-db relations."
+"as <tt>foreign_db</tt>. Those columns have been put in future development "
+"of the cross-db relations."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:939
@@ -2489,14 +2479,13 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:942
-#, fuzzy
msgid ""
"Since release 2.3.0 you can describe, in a special 'table_info' table, which "
"column is to be displayed as a tool-tip when moving the cursor over the "
"corresponding key."
msgstr ""
"Since release 2.3.0 you can describe, in a special 'table_info' table, which "
-"field is to be displayed as a tool-tip when moving the cursor over the "
+"column is to be displayed as a tool-tip when moving the cursor over the "
"corresponding key."
#. type: Content of: <html><body><div><dl><dd>
@@ -2510,27 +2499,27 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:948
-#, fuzzy
msgid ""
"put the table name in <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. "
"'pma_table_info')"
-msgstr "put the table name in <tt>$cfg['Servers'][$i]['table_info']</tt>"
+msgstr ""
+"put the table name in <tt>$cfg['Servers'][$i]['table_info']</tt> (e.g. "
+"'pma_table_info')"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:951
-#, fuzzy
msgid ""
"then for each table where you want to use this feature, click ""
"Structure/Relation view/Choose column to display" to choose the column."
msgstr ""
-"then for each table where you want to use this feature, click ""
-"Structure/Relation view/Choose field to display" to choose the field."
+"then for each table where you want to use this feature, click "
+""Structure/Relation view/Choose column to display" to choose the "
+"column."
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:955
-#, fuzzy
msgid "Usage tip: <a href=\"#faqdisplay\">Display column</a>."
-msgstr "Usage tip: <a href=\"#faqdisplay\">Display field</a>."
+msgstr "Usage tip: <a href=\"#faqdisplay\">Display column</a>."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:958
@@ -2628,7 +2617,6 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:998
-#, fuzzy
msgid ""
"Also new in release 2.5.0 is a MIME-transformation system which is also "
"based on the following table structure. See <a href=\"#transformations\"> "
@@ -2639,16 +2627,17 @@ msgstr ""
"Also new in release 2.5.0 is a MIME-transformation system which is also "
"based on the following table structure. See <a href=\"#transformations\"> "
"Transformations</a> for further information. To use the MIME-transformation "
-"system, your column_info table has to have the three new fields 'mimetype', "
+"system, your column_info table has to have the three new columns 'mimetype', "
"'transformation', 'transformation_options'."
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:1008
-#, fuzzy
msgid ""
"put the table name in <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. "
"'pma_column_info')"
-msgstr "put the table name in <tt>$cfg['Servers'][$i]['column_info']</tt>"
+msgstr ""
+"put the table name in <tt>$cfg['Servers'][$i]['column_info']</tt> (e.g. "
+"'pma_column_info')"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:1011
@@ -2727,11 +2716,12 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:1049
-#, fuzzy
msgid ""
"put the table name in <tt>$cfg['Servers'][$i]['history']</tt> (e.g. "
"'pma_history')"
-msgstr "put the table name in <tt>$cfg['Servers'][$i]['history']</tt>"
+msgstr ""
+"put the table name in <tt>$cfg['Servers'][$i]['history']</tt> (e.g. "
+"'pma_history')"
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1056
@@ -2797,11 +2787,12 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:1081
-#, fuzzy
msgid ""
"put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. "
"'pma_tracking')"
-msgstr "put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt>"
+msgstr ""
+"put the table name in <tt>$cfg['Servers'][$i]['tracking']</tt> (e.g. "
+"'pma_tracking')"
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1086
@@ -2953,11 +2944,12 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:1153
-#, fuzzy
msgid ""
"put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. "
"'pma_designer_coords')"
-msgstr "put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt>"
+msgstr ""
+"put the table name in <tt>$cfg['Servers'][$i]['designer_coords']</tt> (e.g. "
+"'pma_designer_coords')"
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1158
@@ -2970,7 +2962,6 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1160
-#, fuzzy
msgid ""
"Because release 2.5.0 introduced the new MIME-transformation support, the "
"column_info table got enhanced with three new columns. If the above variable "
@@ -2979,7 +2970,7 @@ msgid ""
"superuser."
msgstr ""
"Because release 2.5.0 introduced the new MIME-transformation support, the "
-"column_info table got enhanced with three new fields. If the above variable "
+"column_info table got enhanced with three new columns. If the above variable "
"is set to <tt>TRUE</tt> (default) phpMyAdmin will check if you have the "
"latest table structure available. If not, it will emit a warning to the "
"superuser."
@@ -3513,9 +3504,8 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1318
-#, fuzzy
msgid "$cfg['MemoryLimit'] string [number of bytes]"
-msgstr "$cfg['MemoryLimit'] integer [number of bytes]"
+msgstr "$cfg['MemoryLimit'] string [number of bytes]"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1319
@@ -3651,7 +3641,6 @@ msgstr "$cfg['LoginCookieValidity'] integer [number of seconds]"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1361
-#, fuzzy
msgid ""
"Define how long is login cookie valid. Please note that php configuration "
"option <a href=\"http://php.net/manual/en/session.configuration.php#ini."
@@ -3661,11 +3650,12 @@ msgid ""
"value of $cfg['LoginCookieValidity']."
msgstr ""
"Define how long is login cookie valid. Please note that php configuration "
-"option <a href=\"http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime\">session.gc_maxlifetime</a> might limit session "
-"validity and if session is lost, login cookie is also invalidated. So it is "
-"good idea to set <code>session.gc_maxlifetime</code> at least as high is $cfg"
-"['LoginCookieValidity'] is set."
+"option <a "
+"href=\"http://php.net/manual/en/session.configuration.php#ini.session.gc-"
+"maxlifetime\">session.gc_maxlifetime</a> might limit session validity and if "
+"session is lost, login cookie is also invalidated. So it is a good idea to "
+"set <code>session.gc_maxlifetime</code> not lower than the value of "
+"$cfg['LoginCookieValidity']."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1367
@@ -4201,16 +4191,15 @@ msgstr "$cfg['Order'] string [<tt>DESC</tt>|<tt>ASC</tt>|<tt>SMART</tt>]"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1538
-#, fuzzy
msgid ""
"Defines whether columns are displayed in ascending (<tt>ASC</tt>) order, in "
"descending (<tt>DESC</tt>) order or in a "smart" (<tt>SMART</tt>) "
"order - I.E. descending order for columns of type TIME, DATE, DATETIME and "
"TIMESTAMP, ascending order else- by default."
msgstr ""
-"Defines whether fields are displayed in ascending (<tt>ASC</tt>) order, in "
+"Defines whether columns are displayed in ascending (<tt>ASC</tt>) order, in "
"descending (<tt>DESC</tt>) order or in a "smart" (<tt>SMART</tt>) "
-"order - I.E. descending order for fields of type TIME, DATE, DATETIME and "
+"order - I.E. descending order for columns of type TIME, DATE, DATETIME and "
"TIMESTAMP, ascending order else- by default."
#. type: Content of: <html><body><div><dl><dt>
@@ -4234,35 +4223,31 @@ msgstr "$cfg['ProtectBinary'] boolean or string"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1548
-#, fuzzy
msgid ""
"Defines whether <tt>BLOB</tt> or <tt>BINARY</tt> columns are protected from "
"editing when browsing a table's content. Valid values are:"
msgstr ""
-"Defines whether <tt>BLOB</tt> or <tt>BINARY</tt> fields are protected from "
+"Defines whether <tt>BLOB</tt> or <tt>BINARY</tt> columns are protected from "
"editing when browsing a table's content. Valid values are:"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:1550
-#, fuzzy
msgid "<tt>FALSE</tt> to allow editing of all columns;"
-msgstr "<tt>FALSE</tt> to allow editing of all fields;"
+msgstr "<tt>FALSE</tt> to allow editing of all columns;"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:1551
-#, fuzzy
msgid "<tt>'blob'</tt> to allow editing of all columns except <tt>BLOBS</tt>;"
-msgstr "<tt>'blob'</tt> to allow editing of all fields except <tt>BLOBS</tt>;"
+msgstr "<tt>'blob'</tt> to allow editing of all columns except <tt>BLOBS</tt>;"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:1552
-#, fuzzy
msgid ""
"<tt>'all'</tt> to disallow editing of all <tt>BINARY</tt> or <tt>BLOB</tt> "
"columns."
msgstr ""
"<tt>'all'</tt> to disallow editing of all <tt>BINARY</tt> or <tt>BLOB</tt> "
-"fields."
+"columns."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1557
@@ -4301,32 +4286,29 @@ msgstr "$cfg['CharEditing'] string"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1570
-#, fuzzy
msgid ""
"Defines which type of editing controls should be used for CHAR and VARCHAR "
"columns. Possible values are:"
msgstr ""
"Defines which type of editing controls should be used for CHAR and VARCHAR "
-"fields. Possible values are:"
+"columns. Possible values are:"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:1572
-#, fuzzy
msgid ""
"input - this allows to limit size of text to size of columns in MySQL, but "
"has problems with newlines in columns"
msgstr ""
-"input - this allows to limit size of text to size of field in MySQL, but has "
-"problems with newlines in fields"
+"input - this allows to limit size of text to size of columns in MySQL, but "
+"has problems with newlines in columns"
#. type: Content of: <html><body><div><dl><dd><ul><li>
#: ../phpmyadmin/Documentation.html:1574
-#, fuzzy
msgid ""
"textarea - no problems with newlines in columns, but also no length "
"limitations"
msgstr ""
-"textarea - no problems with newlines in fields, but also no length "
+"textarea - no problems with newlines in columns, but also no length "
"limitations"
#. type: Content of: <html><body><div><dl><dd>
@@ -5227,9 +5209,8 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1857
-#, fuzzy
msgid "Defines whether textarea for LONGTEXT columns should have double size."
-msgstr "Defines whether textarea for LONGTEXT fields should have double size."
+msgstr "Defines whether textarea for LONGTEXT columns should have double size."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1859
@@ -5268,12 +5249,11 @@ msgstr "$cfg['LimitChars'] integer"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1870
-#, fuzzy
msgid ""
"Maximum number of characters showen in any non-numeric column on browse "
"view. Can be turned off by a toggle button on the browse page."
msgstr ""
-"Maximum number of characters showen in any non-numeric field on browse "
+"Maximum number of characters showen in any non-numeric column on browse "
"view. Can be turned off by a toggle button on the browse page."
#. type: Content of: <html><body><div><dl><dt>
@@ -5307,7 +5287,6 @@ msgstr "$cfg['DefaultDisplay'] string"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1883
-#, fuzzy
msgid ""
"There are 3 display modes: horizontal, horizontalflipped and vertical. "
"Define which one is displayed by default. The first mode displays each row "
@@ -5319,8 +5298,9 @@ msgstr ""
"There are 3 display modes: horizontal, horizontalflipped and vertical. "
"Define which one is displayed by default. The first mode displays each row "
"on a horizontal line, the second rotates the headers by 90 degrees, so you "
-"can use descriptive headers even though fields only contain small values and "
-"still print them out. The vertical mode sorts each row on a vertical lineup."
+"can use descriptive headers even though columns only contain small values "
+"and still print them out. The vertical mode sorts each row on a vertical "
+"lineup."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1891
@@ -5355,7 +5335,6 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1905
-#, fuzzy
msgid ""
"When editing/creating new columns in a table all fields normally get lined "
"up one field a line. (default: 'horizontal'). If you set this to 'vertical' "
@@ -5371,9 +5350,9 @@ msgstr ""
"you can have each field lined up vertically beneath each other. You can save "
"up a lot of place on the horizontal direction and no longer have to scroll. "
"If you set this to integer, editing of fewer columns will appear in "
-"'vertical' mode, while editing of more fields still in 'horizontal' mode. "
-"This way you can still effectively edit large number of fields, while having "
-"full view on few of them."
+"'vertical' mode, while editing of more columns still in 'horizontal' mode. "
+"This way you can still effectively edit large number of columns, while "
+"having full view on few of them."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1914
@@ -5391,7 +5370,6 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:1917
-#, fuzzy
msgid ""
"By setting the corresponding variable to <tt>TRUE</tt> you can enable the "
"display of column comments in Browse or Property display. In browse mode, "
@@ -5402,8 +5380,8 @@ msgstr ""
"By setting the corresponding variable to <tt>TRUE</tt> you can enable the "
"display of column comments in Browse or Property display. In browse mode, "
"the comments are shown inside the header. In property mode, comments are "
-"displayed using a CSS-formatted dashed-line below the name of the field. The "
-"comment is shown as a tool-tip for that field."
+"displayed using a CSS-formatted dashed-line below the name of the column. "
+"The comment is shown as a tool-tip for that column."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:1924
@@ -6195,7 +6173,6 @@ msgstr ""
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:2213
-#, fuzzy
msgid ""
"Default queries that will be displayed in query boxes when user didn't "
"specify any. Use %d for database name, %t for table name and %f for a comma "
@@ -6204,7 +6181,7 @@ msgid ""
msgstr ""
"Default queries that will be displayed in query boxes when user didn't "
"specify any. Use %d for database name, %t for table name and %f for a comma "
-"separated list of field names. Note that %t and %f are only applicable to "
+"separated list of column names. Note that %t and %f are only applicable to "
"<tt>$cfg['DefaultQueryTable']</tt>."
#. type: Content of: <html><body><div><dl><dt>
@@ -6609,11 +6586,10 @@ msgstr "$cfg['AttributeTypes'] array"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:2326
-#, fuzzy
msgid ""
"Possible attributes for columns. In most cases you don't need to edit this."
msgstr ""
-"Possible attributes for fields. In most cases you don't need to edit this."
+"Possible attributes for columns. In most cases you don't need to edit this."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:2329
@@ -6686,9 +6662,8 @@ msgstr "$cfg['NumOperators'] array"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:2350
-#, fuzzy
msgid "Operators available for search operations on numeric and date columns."
-msgstr "Operators available for search operations on numeric and date fields."
+msgstr "Operators available for search operations on numeric and date columns."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:2353
@@ -6697,14 +6672,13 @@ msgstr "$cfg['TextOperators'] array"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:2354
-#, fuzzy
msgid ""
"Operators available for search operations on character columns. Note that "
"we put <code>LIKE</code> by default instead of <code>LIKE %...%</code>, to "
"avoid unintended performance problems in case of huge tables."
msgstr ""
-"Operators available for search operations on character fields. Note that we "
-"put <code>LIKE</code> by default instead of <code>LIKE %...%</code>, to "
+"Operators available for search operations on character columns. Note that "
+"we put <code>LIKE</code> by default instead of <code>LIKE %...%</code>, to "
"avoid unintended performance problems in case of huge tables."
#. type: Content of: <html><body><div><dl><dt>
@@ -6714,9 +6688,8 @@ msgstr "$cfg['EnumOperators'] array"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:2360
-#, fuzzy
msgid "Operators available for search operations on ENUM columns."
-msgstr "Operators available for search operations on enum fields."
+msgstr "Operators available for search operations on ENUM columns."
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:2362
@@ -6725,12 +6698,11 @@ msgstr "$cfg['NullOperators'] array"
#. type: Content of: <html><body><div><dl><dd>
#: ../phpmyadmin/Documentation.html:2363
-#, fuzzy
msgid ""
"Additional operators available for search operations when the column can be "
"null."
msgstr ""
-"Additional operators available for search operations when the field can be "
+"Additional operators available for search operations when the column can be "
"null."
#. type: Content of: <html><body><div><h2>
@@ -6771,19 +6743,17 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:2382
-#, fuzzy
msgid ""
"You can apply different transformations to the contents of each column. The "
"transformation will take the content of each column and transform it with "
"certain rules defined in the selected transformation."
msgstr ""
-"You can apply different transformations to the contents of each field. The "
-"transformation will take the content of each field and transform it with "
+"You can apply different transformations to the contents of each column. The "
+"transformation will take the content of each column and transform it with "
"certain rules defined in the selected transformation."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:2386
-#, fuzzy
msgid ""
"Say you have a column 'filename' which contains a filename. Normally you "
"would see in phpMyAdmin only this filename. Using transformations you can "
@@ -6793,10 +6763,10 @@ msgid ""
"strings to append/prepend to a string or the format you want the output "
"stored in."
msgstr ""
-"Say you have a field 'filename' which contains a filename. Normally you "
+"Say you have a column 'filename' which contains a filename. Normally you "
"would see in phpMyAdmin only this filename. Using transformations you can "
"transform that filename into a HTML link, so you can click inside of the "
-"phpMyAdmin structure on the field's link and will see the file displayed in "
+"phpMyAdmin structure on the column's link and will see the file displayed in "
"a new browser window. Using transformation options you can also specify "
"strings to append/prepend to a string or the format you want the output "
"stored in."
@@ -6976,7 +6946,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:2460
-#, fuzzy
msgid ""
"One can, however, use empty mime-types and global transformations which "
"should work for many mimetypes. You can also use transforms on a different "
@@ -6986,7 +6955,7 @@ msgstr ""
"One can, however, use empty mime-types and global transformations which "
"should work for many mimetypes. You can also use transforms on a different "
"mimetype they where built for, but pay attention to option usage as well as "
-"what the transformation does to your field."
+"what the transformation does to your column."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:2465
@@ -7243,7 +7212,6 @@ msgstr ""
#. type: Content of: <html><body><div><ol><li>
#: ../phpmyadmin/Documentation.html:2568
-#, fuzzy
msgid ""
"<b>$meta</b> - Contains an object with information about your column. The "
"data is drawn from the output of the <a href=\"http://www.php.net/"
@@ -7252,22 +7220,22 @@ msgid ""
"\">manual page</a> are available in this variable and can be used to "
"transform a column accordingly to unsigned/zerofill/not_null/... properties."
msgstr ""
-"<b>$meta</b> - Contains an object with field information to your column. "
-"The data is drawn from the output of the <a href=\"http://www.php.net/"
-"mysql_fetch_field\">mysql_fetch_field()</a> function. This means, all object "
-"properties described on the <a href=\"http://www.php.net/mysql_fetch_field"
-"\">manual page</a> are available in this variable and can be used to "
-"transform a field accordingly to unsigned/zerofill/not_null/... properties."
+"<b>$meta</b> - Contains an object with information about your column. The "
+"data is drawn from the output of the <a "
+"href=\"http://www.php.net/mysql_fetch_field\">mysql_fetch_field()</a> "
+"function. This means, all object properties described on the <a "
+"href=\"http://www.php.net/mysql_fetch_field\">manual page</a> are available in "
+"this variable and can be used to transform a column accordingly to "
+"unsigned/zerofill/not_null/... properties."
#. type: Content of: <html><body><div><ol><li>
#: ../phpmyadmin/Documentation.html:2575
-#, fuzzy
msgid ""
"The $meta->mimetype variable contains the original MIME-type of the "
"column (i.e. 'text/plain', 'image/jpeg' etc.)"
msgstr ""
-"The $meta->mimetype variable contains the original MIME-type of the field "
-"(i.e. 'text/plain', 'image/jpeg' etc.)"
+"The $meta->mimetype variable contains the original MIME-type of the "
+"column (i.e. 'text/plain', 'image/jpeg' etc.)"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:2579
@@ -7791,24 +7759,22 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:2776
-#, fuzzy
msgid ""
"<a href=\"#faq1_15\">1.15 I have problems with <i>mysql.user</i> column "
"names.</a>"
msgstr ""
-"<a href=\"#faq1_15\">1.15 I have problems with <i>mysql.user</i> field names."
-"</a>"
+"<a href=\"#faq1_15\">1.15 I have problems with <i>mysql.user</i> column "
+"names.</a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:2779
-#, fuzzy
msgid ""
"In previous MySQL versions, the <tt>User</tt> and <tt>Password</tt>columns "
"were named <tt>user</tt> and <tt>password</tt>. Please modify your column "
"names to align with current standards."
msgstr ""
-"In previous MySQL versions, the <tt>User</tt> and <tt>Password</tt> fields "
-"were named <tt>user</tt> and <tt>password</tt>. Please modify your field "
+"In previous MySQL versions, the <tt>User</tt> and <tt>Password</tt>columns "
+"were named <tt>user</tt> and <tt>password</tt>. Please modify your column "
"names to align with current standards."
#. type: Content of: <html><body><div><h4>
@@ -8110,13 +8076,12 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:2907
-#, fuzzy
msgid ""
"<a href=\"#faq1_23\">1.23 I'm running MySQL on a Win32 machine. Each time I "
"create a new table the table and column names are changed to lowercase!</a>"
msgstr ""
"<a href=\"#faq1_23\">1.23 I'm running MySQL on a Win32 machine. Each time I "
-"create a new table the table and field names are changed to lowercase!</a>"
+"create a new table the table and column names are changed to lowercase!</a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:2910
@@ -8286,13 +8251,12 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:2978
-#, fuzzy
msgid ""
"<a href=\"#faq1_29\">1.29 When I create a table or modify a column, I get an "
"error and the columns are duplicated.</a>"
msgstr ""
-"<a href=\"#faq1_29\">1.29 When I create a table or modify a field, I get an "
-"error and the fields are duplicated.</a>"
+"<a href=\"#faq1_29\">1.29 When I create a table or modify a column, I get an "
+"error and the columns are duplicated.</a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:2981
@@ -8621,7 +8585,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3107
-#, fuzzy
msgid ""
"Suhosin configuration might lead to malfunction in some cases and it can not "
"be fully avoided as phpMyAdmin is kind of application which needs to "
@@ -8634,7 +8597,7 @@ msgid ""
msgstr ""
"Suhosin configuration might lead to malfunction in some cases and it can not "
"be fully avoided as phpMyAdmin is kind of application which needs to "
-"transfer big amounts of fields in single HTTP request, what is something "
+"transfer big amounts of columns in single HTTP request, what is something "
"what Suhosin tries to prevent. Generally all <code>suhosin.request.*</code>, "
"<code>suhosin.post.*</code> and <code>suhosin.get.*</code> directives can "
"have negative effect on phpMyAdmin usability. You can always find in your "
@@ -8771,13 +8734,12 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:3147
-#, fuzzy
msgid ""
"<a href=\"#faq1_40\">1.40 When accessing phpMyAdmin via an Apache reverse "
"proxy, cookie login does not work.</a>"
msgstr ""
"<a href=\"#faq1_40\">1.40 When accessing phpMyAdmin via an Apache reverse "
-"proxy, cookie login does not work,</a>"
+"proxy, cookie login does not work.</a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3149
@@ -9363,14 +9325,13 @@ msgstr "Known limitations"
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:3370
-#, fuzzy
msgid ""
"<a href=\"#login_bug\">3.1 When using <abbr title=\"HyperText Transfer "
"Protocol\">HTTP</abbr> authentication, a user who logged out can not log in "
"again in with the same nick.</a>"
msgstr ""
"<a href=\"#login_bug\">3.1 When using <abbr title=\"HyperText Transfer "
-"Protocol\">HTTP</abbr> authentication, an user who logged out can not log in "
+"Protocol\">HTTP</abbr> authentication, a user who logged out can not log in "
"again in with the same nick.</a>"
#. type: Content of: <html><body><div><p>
@@ -9529,13 +9490,12 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3437
-#, fuzzy
msgid ""
"In Relation view, being able to choose a table in another database, or "
"having more than one index column in the foreign key."
msgstr ""
"In Relation view, being able to choose a table in another database, or "
-"having more than one index field in the foreign key."
+"having more than one index column in the foreign key."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3439
@@ -9548,13 +9508,12 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:3444
-#, fuzzy
msgid ""
"<a href=\"#faq3_7\">3.7 I have table with many (100+) columns and when I try "
"to browse table I get series of errors like "Warning: unable to parse "
"url". How can this be fixed?</a>"
msgstr ""
-"<a href=\"#faq3_7\">3.7 I have table with many (100+) fields and when I try "
+"<a href=\"#faq3_7\">3.7 I have table with many (100+) columns and when I try "
"to browse table I get series of errors like "Warning: unable to parse "
"url". How can this be fixed?</a>"
@@ -9571,13 +9530,12 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:3455
-#, fuzzy
msgid ""
"<a href=\"#faq3_8\">3.8 I cannot use (clickable) HTML-forms in columns where "
"I put a MIME-Transformation onto!</a>"
msgstr ""
-"<a href=\"#faq3_8\">3.8 I cannot use (clickable) HTML-forms in fields where "
-"I put a MIME-Transformation onto!</a>"
+"<a href=\"#faq3_8\">3.8 I cannot use (clickable) HTML-forms in columns where I "
+"put a MIME-Transformation onto!</a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3458
@@ -10184,34 +10142,31 @@ msgstr "Browsers or client <abbr title=\"operating system\">OS</abbr>"
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:3703
-#, fuzzy
msgid ""
"<a href=\"#faq5_1\">5.1 I get an out of memory error, and my controls are "
"non-functional, when trying to create a table with more than 14 columns. </"
"a>"
msgstr ""
-"<a href=\"#faq5_1\">5.1 I get an out of memory error, and my controls are "
-"non-functional, when trying to create a table with more than 14 fields. </a>"
+"<a href=\"#faq5_1\">5.1 I get an out of memory error, and my controls are non-"
+"functional, when trying to create a table with more than 14 columns. </a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3707
-#, fuzzy
msgid ""
"We could reproduce this problem only under Win98/98SE. Testing under WinNT4 "
"or Win2K, we could easily create more than 60 columns."
msgstr ""
"We could reproduce this problem only under Win98/98SE. Testing under WinNT4 "
-"or Win2K, we could easily create more than 60 fields."
+"or Win2K, we could easily create more than 60 columns."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3710
-#, fuzzy
msgid ""
"A workaround is to create a smaller number of columns, then come back to "
"your table properties and add the other columns."
msgstr ""
-"A workaround is to create a smaller number of fields, then come back to your "
-"table properties and add the other fields."
+"A workaround is to create a smaller number of columns, then come back to "
+"your table properties and add the other columns."
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:3715
@@ -10317,7 +10272,6 @@ msgstr "Upgrade to at least Internet Explorer 5.5 SP2."
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:3758
-#, fuzzy
msgid ""
"<a href=\"#faq5_6\">5.6 In Internet Explorer 5.0, 5.5 or 6.0, I get an error "
"(like \"Page not found\") when trying to modify a row in a table with many "
@@ -10325,7 +10279,7 @@ msgid ""
msgstr ""
"<a href=\"#faq5_6\">5.6 In Internet Explorer 5.0, 5.5 or 6.0, I get an error "
"(like \"Page not found\") when trying to modify a row in a table with many "
-"fields, or with a text field </a>"
+"columns, or with a text column </a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3763
@@ -10617,13 +10571,12 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3879
-#, fuzzy
msgid ""
"Examine the <abbr title=\"structured query language\">SQL</abbr> error with "
"care. Often the problem is caused by specifying a wrong column-type."
msgstr ""
"Examine the <abbr title=\"structured query language\">SQL</abbr> error with "
-"care. Often the problem is caused by specifying a wrong field-type."
+"care. Often the problem is caused by specifying a wrong column-type."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3881
@@ -10651,23 +10604,21 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:3893
-#, fuzzy
msgid ""
"<a href=\"#faq6_2\">6.2 When I create a table, I set an index for two "
"columns and phpMyAdmin generates only one index with those two columns. </a>"
msgstr ""
-"<a href=\"#faq6_2\">6.2 When I create a table, I set an index for two fields "
-"and phpMyAdmin generates only one index with those two fields. </a>"
+"<a href=\"#faq6_2\">6.2 When I create a table, I set an index for two columns "
+"and phpMyAdmin generates only one index with those two columns. </a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3898
-#, fuzzy
msgid ""
"This is the way to create a multi-columns index. If you want two indexes, "
"create the first one when creating the table, save, then display the table "
"properties and click the Index link to create the other index."
msgstr ""
-"This is the way to create a multi-fields index. If you want two indexes, "
+"This is the way to create a multi-columns index. If you want two indexes, "
"create the first one when creating the table, save, then display the table "
"properties and click the Index link to create the other index."
@@ -10680,7 +10631,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:3907
-#, fuzzy
msgid ""
"Since version 2.2.3, you have a checkbox for each column that can be null. "
"Before 2.2.3, you had to enter "null", without the quotes, as the "
@@ -10688,11 +10638,11 @@ msgid ""
"real NULL value, so if you enter "NULL" this means you want a "
"literal NULL in the column, and not a NULL value (this works in PHP4)."
msgstr ""
-"Since version 2.2.3, you have a checkbox for each field that can be null. "
+"Since version 2.2.3, you have a checkbox for each column that can be null. "
"Before 2.2.3, you had to enter "null", without the quotes, as the "
-"field's value. Since version 2.5.5, you have to use the checkbox to get a "
+"column's value. Since version 2.5.5, you have to use the checkbox to get a "
"real NULL value, so if you enter "NULL" this means you want a "
-"literal NULL in the field, and not a NULL value (this works in PHP4)."
+"literal NULL in the column, and not a NULL value (this works in PHP4)."
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:3915
@@ -10897,9 +10847,8 @@ msgstr "on table "REL_towns" click Structure, then Relation view"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:3993
-#, fuzzy
msgid "in "Choose column to display", choose "description""
-msgstr "in "Choose field to display", choose "description""
+msgstr "in "Choose column to display", choose "description""
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:3994
@@ -10933,13 +10882,12 @@ msgstr "Click "Update query""
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:4003
-#, fuzzy
msgid ""
"In the columns row, choose persons.person_name and click the ""
"Show" tickbox"
msgstr ""
-"In the fields row, choose persons.person_name and click the "Show" "
-"tickbox"
+"In the columns row, choose persons.person_name and click the "
+""Show" tickbox"
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:4005
@@ -10966,12 +10914,11 @@ msgstr "Click "Submit query""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:4013
-#, fuzzy
msgid ""
"<a href=\"#faqdisplay\">6.7 How can I use the "display column" "
"feature?</a>"
msgstr ""
-"<a href=\"#faqdisplay\">6.7 How can I use the "display field" "
+"<a href=\"#faqdisplay\">6.7 How can I use the "display column" "
"feature?</a>"
#. type: Content of: <html><body><div><p>
@@ -10987,15 +10934,14 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4019
-#, fuzzy
msgid ""
"See also <a href=\"#faq6_21\"><abbr title=\"Frequently Asked Questions"
"\">FAQ</abbr> 6.21</a> for an additional feature that "display "
"column" enables: drop-down list of possible values."
msgstr ""
-"See also <a href=\"#faq6_21\"><abbr title=\"Frequently Asked Questions"
-"\">FAQ</abbr> 6.21</a> for an additional feature that "display "
-"field" enables: drop-down list of possible values."
+"See also <a href=\"#faq6_21\"><abbr title=\"Frequently Asked "
+"Questions\">FAQ</abbr> 6.21</a> for an additional feature that "display "
+"column" enables: drop-down list of possible values."
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:4024
@@ -11223,13 +11169,12 @@ msgstr ""
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:4103
-#, fuzzy
msgid ""
""Enclose table and column names with backquotes" ensures that "
"column and table names formed with special characters are protected."
msgstr ""
-""Enclose table and field names with backquotes" ensures that field "
-"and table names formed with special characters are protected."
+""Enclose table and column names with backquotes" ensures that "
+"column and table names formed with special characters are protected."
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:4105
@@ -11367,30 +11312,28 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:4161
-#, fuzzy
msgid ""
"<a href=\"#faq6_15\">6.15 I want to add a BLOB column and put an index on "
"it, but MySQL says "BLOB column '...' used in key specification without "
"a key length".</a>"
msgstr ""
-"<a href=\"#faq6_15\">6.15 I want to add a BLOB field and put an index on it, "
+"<a href=\"#faq6_15\">6.15 I want to add a BLOB column and put an index on it, "
"but MySQL says "BLOB column '...' used in key specification without a "
"key length".</a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4165
-#, fuzzy
msgid ""
"The right way to do this, is to create the column without any indexes, then "
"display the table structure and use the "Create an index" dialog. "
"On this page, you will be able to choose your BLOB column, and set a size to "
"the index, which is the condition to create an index on a BLOB column."
msgstr ""
-"The right way to do this, is to create the field without any indexes, then "
+"The right way to do this, is to create the column without any indexes, then "
"display the table structure and use the "Create an index" "
-"dialogue. On this page, you will be able to choose your BLOB field, and set "
+"dialogue. On this page, you will be able to choose your BLOB column, and set "
"a size to the index, which is the condition to create an index on a BLOB "
-"field."
+"column."
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:4172
@@ -11431,7 +11374,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4187
-#, fuzzy
msgid ""
"Slow down :). Defining mimetypes is of no use, if you can't put "
"transformations on them. Otherwise you could just put a comment on the "
@@ -11442,10 +11384,10 @@ msgid ""
msgstr ""
"Slow down :). Defining mimetypes is of no use, if you can't put "
"transformations on them. Otherwise you could just put a comment on the "
-"field. Because entering your own mimetype will cause serious syntax checking "
-"issues and validation, this introduces a high-risk false-user-input "
-"situation. Instead you have to initialise mimetypes using functions or empty "
-"mimetype definitions."
+"column. Because entering your own mimetype will cause serious syntax "
+"checking issues and validation, this introduces a high-risk false-user-input "
+"situation. Instead you have to initialise mimetypes using functions or "
+"empty mimetype definitions."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4192
@@ -11673,17 +11615,15 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:4277
-#, fuzzy
msgid ""
"<a href=\"#faq6_21\">6.21 In edit/insert mode, how can I see a list of "
"possible values for a column, based on some foreign table?</a>"
msgstr ""
"<a href=\"#faq6_21\">6.21 In edit/insert mode, how can I see a list of "
-"possible values for a field, based on some foreign table?</a>"
+"possible values for a column, based on some foreign table?</a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4280
-#, fuzzy
msgid ""
"You have to setup appropriate links between the tables, and also setup the "
""display column" in the foreign table. See <a href="
@@ -11695,13 +11635,13 @@ msgid ""
"able to type the first letter of either the key or the display column."
msgstr ""
"You have to setup appropriate links between the tables, and also setup the "
-""display field" in the foreign table. See <a href="
-"\"#faq6_6\"><abbr title=\"Frequently Asked Questions\">FAQ</abbr> 6.6</a> "
-"for an example. Then, if there are 100 values or less in the foreign table, "
-"a drop-down list of values will be available. You will see two lists of "
-"values, the first list containing the key and the display field, the second "
-"list containing the display field and the key. The reason for this is to be "
-"able to type the first letter of either the key or the display field."
+""display column" in the foreign table. See <a href=\"#faq6_6\"><abbr "
+"title=\"Frequently Asked Questions\">FAQ</abbr> 6.6</a> for an example. Then, "
+"if there are 100 values or less in the foreign table, a drop-down list of "
+"values will be available. You will see two lists of values, the first list "
+"containing the key and the display column, the second list containing the "
+"display column and the key. The reason for this is to be able to type the "
+"first letter of either the key or the display column."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4290
@@ -11800,17 +11740,16 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4329
-#, fuzzy
msgid ""
"First, for general information about BLOB streaming on MySQL, visit <a href="
"\"http://blobstreaming.org\">blobstreaming.org</a>. We currently support "
"streaming if you are running MySQL 5.1 with the PBXT and PBMS storage "
"engines. Moreover, only PBMS 0.5.04 is supported."
msgstr ""
-"First, for general information about BLOB streaming on MySQL, visit <a href="
-"\"http://blobstreaming.org\">blobstreaming.org</a>. We currently support "
+"First, for general information about BLOB streaming on MySQL, visit <a "
+"href=\"http://blobstreaming.org\">blobstreaming.org</a>. We currently support "
"streaming if you are running MySQL 5.1 with the PBXT and PBMS storage "
-"engines."
+"engines. Moreover, only PBMS 0.5.04 is supported."
#. type: Content of: <html><body><div><ol><li>
#: ../phpmyadmin/Documentation.html:4332
@@ -11878,10 +11817,8 @@ msgstr ""
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:4341
-#, fuzzy
msgid "<a href=\"#faq6_26\">6.26 How can I select a range of rows?</a>"
-msgstr ""
-"<a href=\"#faq6_3\">6.3 How can I insert a null value into my table?</a>"
+msgstr "<a href=\"#faq6_26\">6.26 How can I select a range of rows?</a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4343
@@ -11890,6 +11827,9 @@ msgid ""
"of the range. This works everywhere you see rows, for example in Browse mode "
"or on the Structure page."
msgstr ""
+"Click the first row of the range, hold the shift key and click the last row "
+"of the range. This works everywhere you see rows, for example in Browse mode "
+"or on the Structure page."
#. type: Content of: <html><body><div><h3>
#: ../phpmyadmin/Documentation.html:4346
@@ -11919,13 +11859,12 @@ msgstr "But please first discuss your bug with other users:"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4356
-#, fuzzy
msgid ""
"<a href=\"https://sourceforge.net/projects/phpmyadmin/forums\"> https://"
"sourceforge.net/projects/phpmyadmin/forums</a>."
msgstr ""
-"<a href=\"http://sf.net/projects/phpmyadmin/\"> http://sf.net/projects/"
-"phpmyadmin/</a> (and choose Forums)"
+"<a href=\"https://sourceforge.net/projects/phpmyadmin/forums\"> "
+"https://sourceforge.net/projects/phpmyadmin/forums</a>."
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:4361
@@ -11938,7 +11877,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4364
-#, fuzzy
msgid ""
"Always use latest Git version of the po file to translate. You can "
"optionally translate online at our <a href=\"http://l10n.cihar.com/"
@@ -11951,20 +11889,20 @@ msgid ""
"on <a href=\"http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators"
"\">our wiki</a>."
msgstr ""
-"Always use latest Git version of po file to translate. You can optionally "
-"translate online at our <a href=\"http://l10n.cihar.com/\">translation "
-"server</a> where you can also get latest po files and merge them with your "
-"translations. For creating new translation simply use <code>po/phpmyadmin."
-"pot</code> and generate <code>po/LANG_CODE.po</code> for your language (you "
-"can use <code>msginit -i po/phpmyadmin.pot -l LANG_CODE --no-translator -o "
-"po/LANG_CODE.po</code> to do this) or ask on mailing list to add the "
-"translation to the web interface. More details are available on <a href="
-"\"http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators\">our wiki</"
-"a>."
+"Always use latest Git version of the po file to translate. You can "
+"optionally translate online at our <a "
+"href=\"http://l10n.cihar.com/\">translation server</a> where you can also get "
+"the latest po files and merge them with your translations. For creating a "
+"new translation simply use <code>po/phpmyadmin.pot</code> and generate "
+"<code>po/LANG_CODE.po</code> for your language (you can use <code>msginit -i "
+"po/phpmyadmin.pot -l LANG_CODE --no-translator -o po/LANG_CODE.po</code> to "
+"do this) or ask on the mailing list to add the translation to the web "
+"interface. More details are available on <a "
+"href=\"http://wiki.phpmyadmin.net/pma/Devel:Gettext_for_translators\">our "
+"wiki</a>."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4375
-#, fuzzy
msgid ""
"Please note that we try not to use HTML entities like &eacute; in the "
"translations, since we define the right character set in the file. With "
@@ -11974,32 +11912,33 @@ msgid ""
msgstr ""
"Please note that we try not to use HTML entities like &eacute; in the "
"translations, since we define the right character set in the file. With "
-"HTML entities, the text on JavaScript messages would not display correctly. "
-"However there are some entities that need to be there, for quotes ,non-"
+"HTML entities, the text on JavaScript messages would not display correctly. "
+" However there are some entities that need to be there: quotes, non-"
"breakable spaces, ampersands, less than, greater than."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4383
-#, fuzzy
msgid ""
"You can then put your translations, as a zip file to avoid losing special "
"characters, on the sourceforge.net <a href=\"https://sourceforge.net/"
"tracker/?group_id=23067&atid=387645\">translation tracker.</a>"
msgstr ""
"You can then put your translations, as a zip file to avoid losing special "
-"characters, on the sourceforge.net translation tracker."
+"characters, on the sourceforge.net <a href=\"https://sourceforge.net/tracker/"
+"?group_id=23067&atid=387645\">translation tracker.</a>"
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4387
-#, fuzzy
msgid ""
"It would be a good idea to subscribe to the <a href=\"https://lists."
"sourceforge.net/lists/listinfo/phpmyadmin-translators\">phpmyadmin-"
"translators</a> mailing list, because this is where we ask for translations "
"of new messages."
msgstr ""
-"It would be a good idea to subscribe to the phpmyadmin-translators mailing "
-"list, because this is where we ask for translations of new messages."
+"It would be a good idea to subscribe to the <a "
+"href=\"https://lists.sourceforge.net/lists/listinfo/phpmyadmin-translators"
+"\">phpmyadmin-translators</a> mailing list, because this is where we ask for "
+"translations of new messages."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4392
@@ -12016,6 +11955,17 @@ msgid ""
"\"https://sourceforge.net/tracker/?group_id=23067&"
"atid=387645\">translation tracker</a>."
msgstr ""
+"Documentation is being translated using po4a and gettext (see <a "
+"href=\"http://www.phpmyadmin.net/home_page/docs.php\">documentation</a> for "
+"existing translations). To start, checkout <a href=\"http://phpmyadmin.git.so"
+"urceforge.net/git/gitweb.cgi?p=phpmyadmin/localized_docs;a=tree;f=po\"><code>"
+"localized_docs/po</code></a> from Git, or just go to the <a "
+"href=\"https://l10n.cihar.com/projects/pmadoc/\">translation server</a> and "
+"translate it online. If your language is missing, just contact <a "
+"href=\"mailto:michal@cihar.com\">Michal Čihař</a>; he will add it. If you "
+"prefer to directly translate the po files, please put updated ones into our "
+"<a href=\"https://sourceforge.net/tracker/?group_id=23067&atid=387645\">tr"
+"anslation tracker</a>."
#. type: Content of: <html><body><div><h4>
#: ../phpmyadmin/Documentation.html:4404
@@ -12123,15 +12073,14 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4441
-#, fuzzy
msgid ""
"If you use Apache web server, phpMyAdmin exports information about "
"authentication to the Apache environment and it can be used in Apache logs. "
"Currently there are two variables available:"
msgstr ""
"If you use Apache web server, phpMyAdmin exports information about "
-"authentication to Apache environment and it can be used in Apache logs. "
-"Currently there are two variables available:"
+"authentication to the Apache environment and it can be used in Apache logs. "
+" Currently there are two variables available:"
#. type: Content of: <html><body><div><dl><dt>
#: ../phpmyadmin/Documentation.html:4446
@@ -12203,7 +12152,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4472
-#, fuzzy
msgid ""
"You can now synchronize databases/tables in phpMyAdmin using the Synchronize "
"feature. It allows you to connect to local as well as remote servers. This "
@@ -12212,14 +12160,13 @@ msgid ""
"placed on the same server or some remote server."
msgstr ""
"You can now synchronise databases/tables in phpMyAdmin using the Synchronise "
-"feature. It allows you to connect to local as well as remote servers.This "
+"feature. It allows you to connect to local as well as remote servers. This "
"requires you to enter server host name, username, password, port and the "
"name of the database. Therefore you can now synchronise your databases "
"placed on the same server or some remote server."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4479
-#, fuzzy
msgid ""
"This feature is helpful for developers who need to replicate their "
"database’s structure as well as data. Moreover, this feature not only "
@@ -12228,10 +12175,10 @@ msgid ""
"the databases can also be synchronized."
msgstr ""
"This feature is helpful for developers who need to replicate their "
-"databases’ structure as well as data. Moreover, this feature not only helps "
-"replication but also facilitates the user to keep his/her database in sync "
-"with another database. Other than the full database, certain tables of the "
-"databases can also be synchronised."
+"database’s structure as well as data. Moreover, this feature not only "
+"helps replication but also facilitates the user to keep his/her database in "
+"sync with another database. Other than the full database, certain tables of "
+"the databases can also be synchronised."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4487
@@ -12261,7 +12208,6 @@ msgstr ""
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4501
-#, fuzzy
msgid ""
"On the left, are listed the source database table names. Some of the names "
"have a <code>+</code> plus sign preceding them. This shows that these tables "
@@ -12270,15 +12216,15 @@ msgid ""
"are not preceded by a <code>+</code> sign are already present in the target "
"database."
msgstr ""
-"On the left, are listed the source database table names. Some of the names "
-"have a ‘+’ plus sign preceding them. This shows that these tables are only "
-"present in source database and they need to be added to the target database "
-"in order to synchronise the target database. The tables whose names are not "
-"preceded by a ‘+’ sign are already present in the target database."
+"On the left, are listed the source database table names. Some of the names "
+"have a <code>+</code> plus sign preceding them. This shows that these tables "
+"are only present in source database and they need to be added to the target "
+"database in order to synchronise the target database. The tables whose "
+"names are not preceded by a <code>+</code> sign are already present in the "
+"target database."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4510
-#, fuzzy
msgid ""
"On the right, are listed the target database table names. There are few "
"table names that have <code>(not present)</code> appended after their names. "
@@ -12290,26 +12236,25 @@ msgid ""
"and target corresponding tables."
msgstr ""
"On the right, are listed the target database table names. There are few "
-"table names that have “(not present)” appended after their names. This means "
-"that these tables are to be created in target database in order to "
-"synchronise target database with source database. Some tables’ names have a "
-"‘-’ minus sign preceding them. This shows that these tables are only present "
-"in target database and they will remain unchanged in the target database. "
-"The column in the middle shows the difference between the source and target "
-"corresponding tables."
+"table names that have <code>(not present)</code> appended after their names. "
+"This means that these tables are to be created in target database in order "
+"to synchronise target database with source database. Some table names have a "
+"<code>-</code> minus sign preceding them. This shows that these tables are "
+"only present in target database and they will remain unchanged in the target "
+"database. The column in the middle shows the difference between the source "
+"and target corresponding tables."
#. type: Content of: <html><body><div><p>
#: ../phpmyadmin/Documentation.html:4521
-#, fuzzy
msgid ""
"The difference is depicted by the red and green buttons with <tt>S</tt> and "
"<tt>D</tt> letters, indicating that either Structure or Data are not up to "
"date. By clicking on them, they will turn grey, what means that they will be "
"synchronized."
msgstr ""
-"The difference is depicted by the red and green buttons with S and D "
-"letters, indicating that either Structure or Data are not up to date. By "
-"clicking on them, they will turn grey, what means that they will be "
+"The difference is depicted by the red and green buttons with <tt>S</tt> and "
+"<tt>D</tt> letters, indicating that either Structure or Data are not up to "
+"date. By clicking on them, they will turn grey, what means that they will be "
"synchronised."
#. type: Content of: <html><body><div><h2>
@@ -13223,13 +13168,12 @@ msgstr ""
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:4890
-#, fuzzy
msgid ""
"Alexandr Bravo <abravo_at_hq.admiral.ru> who contributed tbl_select."
"php3, a feature to display only some columns from a table."
msgstr ""
-"Alexandr Bravo <abravo_at_hq.admiral.ru> who contributed tbl_select."
-"php3, a feature to display only some fields from a table."
+"Alexandr Bravo <abravo_at_hq.admiral.ru> who contributed "
+"tbl_select.php3, a feature to display only some columns from a table."
#. type: Content of: <html><body><div><ul><li>
#: ../phpmyadmin/Documentation.html:4893
hooks/post-receive
--
phpMyAdmin localized documentation
1
0