From 07f2f3cc062b2b2dde3e2010ff0bad85e93c0afa Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 15 Mar 2003 11:45:35 +0000 Subject: [PATCH] automatic layout --- ChangeLog | 3 + lang/afrikaans-iso-8859-1.inc.php3 | 1 + lang/afrikaans-utf-8.inc.php3 | 1 + lang/albanian-iso-8859-1.inc.php3 | 1 + lang/albanian-utf-8.inc.php3 | 1 + lang/arabic-utf-8.inc.php3 | 1 + lang/arabic-windows-1256.inc.php3 | 1 + lang/brazilian_portuguese-iso-8859-1.inc.php3 | 1 + lang/brazilian_portuguese-utf-8.inc.php3 | 1 + lang/bulgarian-koi8-r.inc.php3 | 1 + lang/bulgarian-utf-8.inc.php3 | 1 + lang/bulgarian-windows-1251.inc.php3 | 1 + lang/catalan-iso-8859-1.inc.php3 | 1 + lang/catalan-utf-8.inc.php3 | 1 + lang/chinese_big5-utf-8.inc.php3 | 1 + lang/chinese_big5.inc.php3 | 1 + lang/chinese_gb-utf-8.inc.php3 | 1 + lang/chinese_gb.inc.php3 | 1 + lang/croatian-iso-8859-2.inc.php3 | 1 + lang/croatian-utf-8.inc.php3 | 1 + lang/croatian-windows-1250.inc.php3 | 1 + lang/czech-iso-8859-2.inc.php3 | 1 + lang/czech-utf-8.inc.php3 | 1 + lang/czech-windows-1250.inc.php3 | 1 + lang/danish-iso-8859-1.inc.php3 | 1 + lang/danish-utf-8.inc.php3 | 1 + lang/dutch-iso-8859-1.inc.php3 | 1 + lang/dutch-utf-8.inc.php3 | 1 + lang/english-iso-8859-1.inc.php3 | 20 ++-- lang/english-utf-8.inc.php3 | 20 ++-- lang/estonian-iso-8859-1.inc.php3 | 1 + lang/estonian-utf-8.inc.php3 | 1 + lang/farsi-utf-8.inc.php3 | 1 + lang/farsi-windows-1256.inc.php3 | 1 + lang/finnish-iso-8859-1.inc.php3 | 1 + lang/finnish-utf-8.inc.php3 | 1 + lang/french-iso-8859-1.inc.php3 | 1 + lang/french-utf-8.inc.php3 | 1 + lang/galician-iso-8859-1.inc.php3 | 1 + lang/galician-utf-8.inc.php3 | 1 + lang/georgian-utf-8.inc.php3 | 1 + lang/german-iso-8859-1.inc.php3 | 1 + lang/german-utf-8.inc.php3 | 1 + lang/greek-iso-8859-7.inc.php3 | 1 + lang/greek-utf-8.inc.php3 | 1 + lang/hebrew-iso-8859-8-i.inc.php3 | 1 + lang/hindi-utf-8.inc.php3 | 1 + lang/hungarian-iso-8859-2.inc.php3 | 1 + lang/hungarian-utf-8.inc.php3 | 1 + lang/indonesian-iso-8859-1.inc.php3 | 1 + lang/indonesian-utf-8.inc.php3 | 1 + lang/italian-iso-8859-1.inc.php3 | 1 + lang/italian-utf-8.inc.php3 | 1 + lang/japanese-euc.inc.php3 | 1 + lang/japanese-sjis.inc.php3 | 1 + lang/japanese-utf-8.inc.php3 | 1 + lang/korean-ks_c_5601-1987.inc.php3 | 1 + lang/latvian-utf-8.inc.php3 | 1 + lang/latvian-windows-1257.inc.php3 | 1 + lang/lithuanian-utf-8.inc.php3 | 1 + lang/lithuanian-windows-1257.inc.php3 | 1 + lang/malay-iso-8859-1.inc.php3 | 1 + lang/malay-utf-8.inc.php3 | 1 + lang/norwegian-iso-8859-1.inc.php3 | 1 + lang/norwegian-utf-8.inc.php3 | 1 + lang/polish-iso-8859-2.inc.php3 | 1 + lang/polish-utf-8.inc.php3 | 1 + lang/portuguese-iso-8859-1.inc.php3 | 1 + lang/portuguese-utf-8.inc.php3 | 1 + lang/romanian-iso-8859-1.inc.php3 | 1 + lang/romanian-utf-8.inc.php3 | 1 + lang/russian-dos-866.inc.php3 | 1 + lang/russian-koi8-r.inc.php3 | 1 + lang/russian-utf-8.inc.php3 | 1 + lang/russian-windows-1251.inc.php3 | 1 + lang/serbian-utf-8.inc.php3 | 1 + lang/serbian-windows-1250.inc.php3 | 1 + lang/slovak-iso-8859-2.inc.php3 | 1 + lang/slovak-utf-8.inc.php3 | 1 + lang/slovak-windows-1250.inc.php3 | 1 + lang/slovenian-iso-8859-2.inc.php3 | 1 + lang/slovenian-utf-8.inc.php3 | 1 + lang/slovenian-windows-1250.inc.php3 | 1 + lang/spanish-iso-8859-1.inc.php3 | 1 + lang/spanish-utf-8.inc.php3 | 1 + lang/swedish-iso-8859-1.inc.php3 | 1 + lang/swedish-utf-8.inc.php3 | 1 + lang/thai-tis-620.inc.php3 | 1 + lang/thai-utf-8.inc.php3 | 1 + lang/turkish-iso-8859-9.inc.php3 | 1 + lang/turkish-utf-8.inc.php3 | 1 + lang/ukrainian-utf-8.inc.php3 | 1 + lang/ukrainian-windows-1251.inc.php3 | 1 + pdf_pages.php3 | 107 +++++++++++++++++- 94 files changed, 220 insertions(+), 20 deletions(-) diff --git a/ChangeLog b/ChangeLog index 78e55022d..44a2ae34d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-03-15 Marc Delisle + * pdf_pages.php3: Automatic layout of tables on the schema + 2003-03-15 Garvin Hicking * pdf_schema.php3: Fixed typo. diff --git a/lang/afrikaans-iso-8859-1.inc.php3 b/lang/afrikaans-iso-8859-1.inc.php3 index d03b133c5..31de3f5c5 100644 --- a/lang/afrikaans-iso-8859-1.inc.php3 +++ b/lang/afrikaans-iso-8859-1.inc.php3 @@ -623,4 +623,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/afrikaans-utf-8.inc.php3 b/lang/afrikaans-utf-8.inc.php3 index 691049b1b..4957fad33 100644 --- a/lang/afrikaans-utf-8.inc.php3 +++ b/lang/afrikaans-utf-8.inc.php3 @@ -624,4 +624,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/albanian-iso-8859-1.inc.php3 b/lang/albanian-iso-8859-1.inc.php3 index bf5c86e08..d6c0bd05a 100644 --- a/lang/albanian-iso-8859-1.inc.php3 +++ b/lang/albanian-iso-8859-1.inc.php3 @@ -616,4 +616,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php3 b/lang/albanian-utf-8.inc.php3 index d9a016d02..3c20f64cb 100644 --- a/lang/albanian-utf-8.inc.php3 +++ b/lang/albanian-utf-8.inc.php3 @@ -617,4 +617,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php3 b/lang/arabic-utf-8.inc.php3 index d11fa4799..b758153be 100644 --- a/lang/arabic-utf-8.inc.php3 +++ b/lang/arabic-utf-8.inc.php3 @@ -638,4 +638,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/arabic-windows-1256.inc.php3 b/lang/arabic-windows-1256.inc.php3 index f83ab6e2f..41813cb54 100644 --- a/lang/arabic-windows-1256.inc.php3 +++ b/lang/arabic-windows-1256.inc.php3 @@ -637,4 +637,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php3 b/lang/brazilian_portuguese-iso-8859-1.inc.php3 index 87b1aa666..480645849 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php3 +++ b/lang/brazilian_portuguese-iso-8859-1.inc.php3 @@ -637,4 +637,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php3 b/lang/brazilian_portuguese-utf-8.inc.php3 index 860f273a8..74af486c4 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php3 +++ b/lang/brazilian_portuguese-utf-8.inc.php3 @@ -638,4 +638,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/bulgarian-koi8-r.inc.php3 b/lang/bulgarian-koi8-r.inc.php3 index 08a426351..6c10316e9 100644 --- a/lang/bulgarian-koi8-r.inc.php3 +++ b/lang/bulgarian-koi8-r.inc.php3 @@ -636,4 +636,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php3 b/lang/bulgarian-utf-8.inc.php3 index 21e0071e2..b7e5866aa 100644 --- a/lang/bulgarian-utf-8.inc.php3 +++ b/lang/bulgarian-utf-8.inc.php3 @@ -637,4 +637,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/bulgarian-windows-1251.inc.php3 b/lang/bulgarian-windows-1251.inc.php3 index 9933786ae..b7783db9f 100644 --- a/lang/bulgarian-windows-1251.inc.php3 +++ b/lang/bulgarian-windows-1251.inc.php3 @@ -636,4 +636,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/catalan-iso-8859-1.inc.php3 b/lang/catalan-iso-8859-1.inc.php3 index 63da710c1..5915b9b74 100644 --- a/lang/catalan-iso-8859-1.inc.php3 +++ b/lang/catalan-iso-8859-1.inc.php3 @@ -609,4 +609,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php3 b/lang/catalan-utf-8.inc.php3 index 1e630d664..60918dbb6 100644 --- a/lang/catalan-utf-8.inc.php3 +++ b/lang/catalan-utf-8.inc.php3 @@ -610,4 +610,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/chinese_big5-utf-8.inc.php3 b/lang/chinese_big5-utf-8.inc.php3 index 27cc2852d..d377869f7 100644 --- a/lang/chinese_big5-utf-8.inc.php3 +++ b/lang/chinese_big5-utf-8.inc.php3 @@ -636,4 +636,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index c35a74470..cca26bb6e 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -635,4 +635,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/chinese_gb-utf-8.inc.php3 b/lang/chinese_gb-utf-8.inc.php3 index f8f5dfdaf..28bd745c6 100644 --- a/lang/chinese_gb-utf-8.inc.php3 +++ b/lang/chinese_gb-utf-8.inc.php3 @@ -635,4 +635,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index ac9d79304..3c78f048a 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -634,4 +634,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/croatian-iso-8859-2.inc.php3 b/lang/croatian-iso-8859-2.inc.php3 index 2e202718c..7d638bd46 100644 --- a/lang/croatian-iso-8859-2.inc.php3 +++ b/lang/croatian-iso-8859-2.inc.php3 @@ -636,4 +636,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php3 b/lang/croatian-utf-8.inc.php3 index d40273760..71cf6eb1c 100644 --- a/lang/croatian-utf-8.inc.php3 +++ b/lang/croatian-utf-8.inc.php3 @@ -637,4 +637,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/croatian-windows-1250.inc.php3 b/lang/croatian-windows-1250.inc.php3 index 5b527f631..2699d4511 100644 --- a/lang/croatian-windows-1250.inc.php3 +++ b/lang/croatian-windows-1250.inc.php3 @@ -636,4 +636,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/czech-iso-8859-2.inc.php3 b/lang/czech-iso-8859-2.inc.php3 index 639617688..3f8419af4 100644 --- a/lang/czech-iso-8859-2.inc.php3 +++ b/lang/czech-iso-8859-2.inc.php3 @@ -616,4 +616,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php3 b/lang/czech-utf-8.inc.php3 index b0999e44e..2e4679917 100644 --- a/lang/czech-utf-8.inc.php3 +++ b/lang/czech-utf-8.inc.php3 @@ -617,4 +617,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/czech-windows-1250.inc.php3 b/lang/czech-windows-1250.inc.php3 index 9b81289cf..c994bd557 100644 --- a/lang/czech-windows-1250.inc.php3 +++ b/lang/czech-windows-1250.inc.php3 @@ -616,4 +616,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/danish-iso-8859-1.inc.php3 b/lang/danish-iso-8859-1.inc.php3 index 712808445..48e4f8e0d 100644 --- a/lang/danish-iso-8859-1.inc.php3 +++ b/lang/danish-iso-8859-1.inc.php3 @@ -631,4 +631,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php3 b/lang/danish-utf-8.inc.php3 index b7d03b117..cf83e5b29 100644 --- a/lang/danish-utf-8.inc.php3 +++ b/lang/danish-utf-8.inc.php3 @@ -632,4 +632,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/dutch-iso-8859-1.inc.php3 b/lang/dutch-iso-8859-1.inc.php3 index 1425473e4..a40e493d2 100644 --- a/lang/dutch-iso-8859-1.inc.php3 +++ b/lang/dutch-iso-8859-1.inc.php3 @@ -613,4 +613,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php3 b/lang/dutch-utf-8.inc.php3 index 60606e39b..5dd3c90c6 100644 --- a/lang/dutch-utf-8.inc.php3 +++ b/lang/dutch-utf-8.inc.php3 @@ -614,4 +614,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3 index 5dac103d3..621a3772f 100644 --- a/lang/english-iso-8859-1.inc.php3 +++ b/lang/english-iso-8859-1.inc.php3 @@ -58,6 +58,7 @@ $strAscending = 'Ascending'; $strAtBeginningOfTable = 'At Beginning of Table'; $strAtEndOfTable = 'At End of Table'; $strAttr = 'Attributes'; +$strAutomaticLayout = 'Automatic layout'; $strBack = 'Back'; $strBeginCut = 'BEGIN CUT'; @@ -73,6 +74,7 @@ $strBrowse = 'Browse'; $strBzError = 'phpMyAdmin was unable to compress the dump because of a broken Bz2 extension in this php version. It is strongly recommended to set the $cfg[\'BZipDump\'] directive in your phpMyAdmin configuration file to FALSE. If you want to use the Bz2 compression features, you should upgrade to a later php version. See php bug report %s for details.'; $strBzip = '"bzipped"'; +$strCSVOptions = 'CSV options'; $strCannotLogin = 'Cannot login to MySQL server'; $strCantLoad = 'cannot load %s extension,
please check PHP Configuration'; $strCantLoadMySQL = 'cannot load MySQL extension,
please check PHP Configuration.'; @@ -318,6 +320,7 @@ $strNoFrames = 'phpMyAdmin is more friendly with a frames-capable browser $strNoIndex = 'No index defined!'; $strNoIndexPartsDefined = 'No index parts defined!'; $strNoModification = 'No change'; +$strNoOptions = 'This format has no options'; $strNoPassword = 'No Password'; $strNoPhp = 'Without PHP Code'; $strNoPrivileges = 'No Privileges'; @@ -360,6 +363,8 @@ $strPdfInvalidPageNum = 'Undefined PDF page number!'; $strPdfInvalidTblName = 'The "%s" table doesn\'t exist!'; $strPdfNoTables = 'No tables'; $strPerHour = 'per hour'; +$strPerMinute = 'per minute'; +$strPerSecond = 'per second'; $strPhp = 'Create PHP Code'; $strPmaDocumentation = 'phpMyAdmin documentation'; $strPmaUriError = 'The $cfg[\'PmaAbsoluteUri\'] directive MUST be set in your configuration file!'; @@ -460,6 +465,7 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s'; $strRunning = 'running on %s'; $strSQL = 'SQL'; +$strSQLOptions = 'SQL options'; $strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:'; $strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem'; $strSQLQuery = 'SQL-query'; @@ -514,6 +520,9 @@ $strSize = 'Size'; $strSort = 'Sort'; $strSpaceUsage = 'Space usage'; $strSplitWordsWithSpace = 'Words are separated by a space character (" ").'; +$strStatCheckTime = 'Last check'; +$strStatCreateTime = 'Creation'; +$strStatUpdateTime = 'Last update'; $strStatement = 'Statements'; $strStatus = 'Status'; $strStrucCSV = 'CSV data'; @@ -595,18 +604,11 @@ $strWritingCommentNotPossible = 'Writing of comment not possible'; $strWritingRelationNotPossible = 'Writing of relation not possible'; $strWrongUser = 'Wrong username/password. Access denied.'; +$strXML = 'XML'; + $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; -$strSQLOptions = 'SQL options'; -$strXML = 'XML'; -$strCSVOptions = 'CSV options'; -$strNoOptions = 'This format has no options'; -$strStatCreateTime = 'Creation'; -$strStatUpdateTime = 'Last update'; -$strStatCheckTime = 'Last check'; -$strPerMinute = 'per minute'; -$strPerSecond = 'per second'; ?> diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3 index adbe15f9e..e21a2c91b 100644 --- a/lang/english-utf-8.inc.php3 +++ b/lang/english-utf-8.inc.php3 @@ -59,6 +59,7 @@ $strAscending = 'Ascending'; $strAtBeginningOfTable = 'At Beginning of Table'; $strAtEndOfTable = 'At End of Table'; $strAttr = 'Attributes'; +$strAutomaticLayout = 'Automatic layout'; $strBack = 'Back'; $strBeginCut = 'BEGIN CUT'; @@ -74,6 +75,7 @@ $strBrowse = 'Browse'; $strBzError = 'phpMyAdmin was unable to compress the dump because of a broken Bz2 extension in this php version. It is strongly recommended to set the $cfg[\'BZipDump\'] directive in your phpMyAdmin configuration file to FALSE. If you want to use the Bz2 compression features, you should upgrade to a later php version. See php bug report %s for details.'; $strBzip = '"bzipped"'; +$strCSVOptions = 'CSV options'; $strCannotLogin = 'Cannot login to MySQL server'; $strCantLoad = 'cannot load %s extension,
please check PHP Configuration'; $strCantLoadMySQL = 'cannot load MySQL extension,
please check PHP Configuration.'; @@ -319,6 +321,7 @@ $strNoFrames = 'phpMyAdmin is more friendly with a frames-capable browser $strNoIndex = 'No index defined!'; $strNoIndexPartsDefined = 'No index parts defined!'; $strNoModification = 'No change'; +$strNoOptions = 'This format has no options'; $strNoPassword = 'No Password'; $strNoPhp = 'Without PHP Code'; $strNoPrivileges = 'No Privileges'; @@ -361,6 +364,8 @@ $strPdfInvalidPageNum = 'Undefined PDF page number!'; $strPdfInvalidTblName = 'The "%s" table doesn\'t exist!'; $strPdfNoTables = 'No tables'; $strPerHour = 'per hour'; +$strPerMinute = 'per minute'; +$strPerSecond = 'per second'; $strPhp = 'Create PHP Code'; $strPmaDocumentation = 'phpMyAdmin documentation'; $strPmaUriError = 'The $cfg[\'PmaAbsoluteUri\'] directive MUST be set in your configuration file!'; @@ -461,6 +466,7 @@ $strRunSQLQuery = 'Run SQL query/queries on database %s'; $strRunning = 'running on %s'; $strSQL = 'SQL'; +$strSQLOptions = 'SQL options'; $strSQLParserBugMessage = 'There is a chance that you may have found a bug in the SQL parser. Please examine your query closely, and check that the quotes are correct and not mis-matched. Other possible failure causes may be that you are uploading a file with binary outside of a quoted text area. You can also try your query on the MySQL command line interface. The MySQL server error output below, if there is any, may also help you in diagnosing the problem. If you still have problems or if the parser fails where the command line interface succeeds, please reduce your SQL query input to the single query that causes problems, and submit a bug report with the data chunk in the CUT section below:'; $strSQLParserUserError = 'There seems to be an error in your SQL query. The MySQL server error output below, if there is any, may also help you in diagnosing the problem'; $strSQLQuery = 'SQL-query'; @@ -515,6 +521,9 @@ $strSize = 'Size'; $strSort = 'Sort'; $strSpaceUsage = 'Space usage'; $strSplitWordsWithSpace = 'Words are separated by a space character (" ").'; +$strStatCheckTime = 'Last check'; +$strStatCreateTime = 'Creation'; +$strStatUpdateTime = 'Last update'; $strStatement = 'Statements'; $strStatus = 'Status'; $strStrucCSV = 'CSV data'; @@ -596,18 +605,11 @@ $strWritingCommentNotPossible = 'Writing of comment not possible'; $strWritingRelationNotPossible = 'Writing of relation not possible'; $strWrongUser = 'Wrong username/password. Access denied.'; +$strXML = 'XML'; + $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; -$strSQLOptions = 'SQL options'; -$strXML = 'XML'; -$strCSVOptions = 'CSV options'; -$strNoOptions = 'This format has no options'; -$strStatCreateTime = 'Creation'; -$strStatUpdateTime = 'Last update'; -$strStatCheckTime = 'Last check'; -$strPerMinute = 'per minute'; -$strPerSecond = 'per second'; ?> diff --git a/lang/estonian-iso-8859-1.inc.php3 b/lang/estonian-iso-8859-1.inc.php3 index 40c90240e..0047be81b 100644 --- a/lang/estonian-iso-8859-1.inc.php3 +++ b/lang/estonian-iso-8859-1.inc.php3 @@ -612,4 +612,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php3 b/lang/estonian-utf-8.inc.php3 index ab76ea45f..ea0be8cf7 100644 --- a/lang/estonian-utf-8.inc.php3 +++ b/lang/estonian-utf-8.inc.php3 @@ -613,4 +613,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/farsi-utf-8.inc.php3 b/lang/farsi-utf-8.inc.php3 index 5c5b22929..1912bfd01 100644 --- a/lang/farsi-utf-8.inc.php3 +++ b/lang/farsi-utf-8.inc.php3 @@ -612,4 +612,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/farsi-windows-1256.inc.php3 b/lang/farsi-windows-1256.inc.php3 index 969f2dc97..2dd7b26db 100644 --- a/lang/farsi-windows-1256.inc.php3 +++ b/lang/farsi-windows-1256.inc.php3 @@ -611,4 +611,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php3 b/lang/finnish-iso-8859-1.inc.php3 index 0533feacc..664fb23c5 100644 --- a/lang/finnish-iso-8859-1.inc.php3 +++ b/lang/finnish-iso-8859-1.inc.php3 @@ -633,4 +633,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php3 b/lang/finnish-utf-8.inc.php3 index 0c572a53c..c5e0d716a 100644 --- a/lang/finnish-utf-8.inc.php3 +++ b/lang/finnish-utf-8.inc.php3 @@ -634,4 +634,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/french-iso-8859-1.inc.php3 b/lang/french-iso-8859-1.inc.php3 index 1e5facc7d..583de8b46 100644 --- a/lang/french-iso-8859-1.inc.php3 +++ b/lang/french-iso-8859-1.inc.php3 @@ -610,4 +610,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/french-utf-8.inc.php3 b/lang/french-utf-8.inc.php3 index f7ca6ba5d..b1a0e446f 100644 --- a/lang/french-utf-8.inc.php3 +++ b/lang/french-utf-8.inc.php3 @@ -611,4 +611,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/galician-iso-8859-1.inc.php3 b/lang/galician-iso-8859-1.inc.php3 index 92e768a90..3547d8259 100644 --- a/lang/galician-iso-8859-1.inc.php3 +++ b/lang/galician-iso-8859-1.inc.php3 @@ -613,4 +613,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php3 b/lang/galician-utf-8.inc.php3 index df58a754e..330e09a4f 100644 --- a/lang/galician-utf-8.inc.php3 +++ b/lang/galician-utf-8.inc.php3 @@ -614,4 +614,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php3 b/lang/georgian-utf-8.inc.php3 index 7ddc6b31c..e2f24c833 100644 --- a/lang/georgian-utf-8.inc.php3 +++ b/lang/georgian-utf-8.inc.php3 @@ -636,4 +636,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php3 index ec67fcbf6..c85d5e489 100644 --- a/lang/german-iso-8859-1.inc.php3 +++ b/lang/german-iso-8859-1.inc.php3 @@ -618,4 +618,5 @@ $strStatUpdateTime = 'Aktualisiert am'; $strStatCheckTime = 'Letzter Check am'; $strPerMinute = 'pro Minute'; $strPerSecond = 'pro Sekunde'; +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php3 index 41f30a12f..cefa43d2a 100644 --- a/lang/german-utf-8.inc.php3 +++ b/lang/german-utf-8.inc.php3 @@ -619,4 +619,5 @@ $strStatUpdateTime = 'Aktualisiert am'; $strStatCheckTime = 'Letzter Check am'; $strPerMinute = 'pro Minute'; $strPerSecond = 'pro Sekunde'; +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/greek-iso-8859-7.inc.php3 b/lang/greek-iso-8859-7.inc.php3 index 777371c03..7e1fccfa3 100644 --- a/lang/greek-iso-8859-7.inc.php3 +++ b/lang/greek-iso-8859-7.inc.php3 @@ -635,4 +635,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php3 b/lang/greek-utf-8.inc.php3 index cef01d2dc..14769b45d 100644 --- a/lang/greek-utf-8.inc.php3 +++ b/lang/greek-utf-8.inc.php3 @@ -636,4 +636,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php3 b/lang/hebrew-iso-8859-8-i.inc.php3 index 3716f8c69..b88f954f1 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php3 +++ b/lang/hebrew-iso-8859-8-i.inc.php3 @@ -633,4 +633,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php3 b/lang/hindi-utf-8.inc.php3 index 51aea0d99..b95ecb6c6 100644 --- a/lang/hindi-utf-8.inc.php3 +++ b/lang/hindi-utf-8.inc.php3 @@ -647,4 +647,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/hungarian-iso-8859-2.inc.php3 b/lang/hungarian-iso-8859-2.inc.php3 index edd66d6e6..4bb59cccc 100644 --- a/lang/hungarian-iso-8859-2.inc.php3 +++ b/lang/hungarian-iso-8859-2.inc.php3 @@ -621,4 +621,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php3 b/lang/hungarian-utf-8.inc.php3 index 0502354e6..4cd41179c 100644 --- a/lang/hungarian-utf-8.inc.php3 +++ b/lang/hungarian-utf-8.inc.php3 @@ -622,4 +622,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/indonesian-iso-8859-1.inc.php3 b/lang/indonesian-iso-8859-1.inc.php3 index be92768bf..ad1a962ee 100644 --- a/lang/indonesian-iso-8859-1.inc.php3 +++ b/lang/indonesian-iso-8859-1.inc.php3 @@ -609,4 +609,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php3 b/lang/indonesian-utf-8.inc.php3 index 73e623552..98f541319 100644 --- a/lang/indonesian-utf-8.inc.php3 +++ b/lang/indonesian-utf-8.inc.php3 @@ -610,4 +610,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/italian-iso-8859-1.inc.php3 b/lang/italian-iso-8859-1.inc.php3 index 45ae43498..9d01605b1 100644 --- a/lang/italian-iso-8859-1.inc.php3 +++ b/lang/italian-iso-8859-1.inc.php3 @@ -614,4 +614,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php3 b/lang/italian-utf-8.inc.php3 index 36c102ba5..8587594ba 100644 --- a/lang/italian-utf-8.inc.php3 +++ b/lang/italian-utf-8.inc.php3 @@ -615,4 +615,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index 1aff6236d..822610c56 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -621,4 +621,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index 0541089d3..8b7dc5ac3 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -621,4 +621,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php3 b/lang/japanese-utf-8.inc.php3 index 7f24ce4a7..adafb75c7 100644 --- a/lang/japanese-utf-8.inc.php3 +++ b/lang/japanese-utf-8.inc.php3 @@ -622,4 +622,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/korean-ks_c_5601-1987.inc.php3 b/lang/korean-ks_c_5601-1987.inc.php3 index ec72be01a..1f9304f7b 100644 --- a/lang/korean-ks_c_5601-1987.inc.php3 +++ b/lang/korean-ks_c_5601-1987.inc.php3 @@ -635,4 +635,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php3 b/lang/latvian-utf-8.inc.php3 index ec6aa621d..f2392378a 100644 --- a/lang/latvian-utf-8.inc.php3 +++ b/lang/latvian-utf-8.inc.php3 @@ -637,4 +637,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/latvian-windows-1257.inc.php3 b/lang/latvian-windows-1257.inc.php3 index 7ad9b2df9..d1a61bd8d 100644 --- a/lang/latvian-windows-1257.inc.php3 +++ b/lang/latvian-windows-1257.inc.php3 @@ -636,4 +636,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php3 b/lang/lithuanian-utf-8.inc.php3 index 032a14141..9d337a29e 100644 --- a/lang/lithuanian-utf-8.inc.php3 +++ b/lang/lithuanian-utf-8.inc.php3 @@ -610,4 +610,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/lithuanian-windows-1257.inc.php3 b/lang/lithuanian-windows-1257.inc.php3 index 6913bc6b1..c2fb070e1 100644 --- a/lang/lithuanian-windows-1257.inc.php3 +++ b/lang/lithuanian-windows-1257.inc.php3 @@ -609,4 +609,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/malay-iso-8859-1.inc.php3 b/lang/malay-iso-8859-1.inc.php3 index 0378bab2f..b4c9439cd 100644 --- a/lang/malay-iso-8859-1.inc.php3 +++ b/lang/malay-iso-8859-1.inc.php3 @@ -632,4 +632,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php3 b/lang/malay-utf-8.inc.php3 index 88d827d05..3a2fca9e5 100644 --- a/lang/malay-utf-8.inc.php3 +++ b/lang/malay-utf-8.inc.php3 @@ -633,4 +633,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/norwegian-iso-8859-1.inc.php3 b/lang/norwegian-iso-8859-1.inc.php3 index 6daf3ed20..1822bc00a 100644 --- a/lang/norwegian-iso-8859-1.inc.php3 +++ b/lang/norwegian-iso-8859-1.inc.php3 @@ -611,4 +611,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php3 b/lang/norwegian-utf-8.inc.php3 index 8fdc9bfe4..7fa3676ea 100644 --- a/lang/norwegian-utf-8.inc.php3 +++ b/lang/norwegian-utf-8.inc.php3 @@ -612,4 +612,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/polish-iso-8859-2.inc.php3 b/lang/polish-iso-8859-2.inc.php3 index 3e895ee01..2082b2578 100644 --- a/lang/polish-iso-8859-2.inc.php3 +++ b/lang/polish-iso-8859-2.inc.php3 @@ -609,4 +609,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php3 b/lang/polish-utf-8.inc.php3 index c8bcb5a27..97cbd7e07 100644 --- a/lang/polish-utf-8.inc.php3 +++ b/lang/polish-utf-8.inc.php3 @@ -610,4 +610,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/portuguese-iso-8859-1.inc.php3 b/lang/portuguese-iso-8859-1.inc.php3 index ed2457d18..3c33f1dae 100644 --- a/lang/portuguese-iso-8859-1.inc.php3 +++ b/lang/portuguese-iso-8859-1.inc.php3 @@ -632,4 +632,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php3 b/lang/portuguese-utf-8.inc.php3 index f1cee8938..4ff0100f3 100644 --- a/lang/portuguese-utf-8.inc.php3 +++ b/lang/portuguese-utf-8.inc.php3 @@ -633,4 +633,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/romanian-iso-8859-1.inc.php3 b/lang/romanian-iso-8859-1.inc.php3 index b4b53f380..32ac6a4fc 100644 --- a/lang/romanian-iso-8859-1.inc.php3 +++ b/lang/romanian-iso-8859-1.inc.php3 @@ -610,4 +610,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php3 b/lang/romanian-utf-8.inc.php3 index fb8d1e156..8614005c4 100644 --- a/lang/romanian-utf-8.inc.php3 +++ b/lang/romanian-utf-8.inc.php3 @@ -611,4 +611,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/russian-dos-866.inc.php3 b/lang/russian-dos-866.inc.php3 index dfee2df17..9941427f7 100644 --- a/lang/russian-dos-866.inc.php3 +++ b/lang/russian-dos-866.inc.php3 @@ -619,4 +619,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php3 b/lang/russian-koi8-r.inc.php3 index ca2a68ba8..91980fa46 100644 --- a/lang/russian-koi8-r.inc.php3 +++ b/lang/russian-koi8-r.inc.php3 @@ -617,4 +617,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php3 b/lang/russian-utf-8.inc.php3 index 1670b11be..b12424935 100644 --- a/lang/russian-utf-8.inc.php3 +++ b/lang/russian-utf-8.inc.php3 @@ -618,4 +618,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/russian-windows-1251.inc.php3 b/lang/russian-windows-1251.inc.php3 index 23562be57..aab21e5b5 100644 --- a/lang/russian-windows-1251.inc.php3 +++ b/lang/russian-windows-1251.inc.php3 @@ -617,4 +617,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/serbian-utf-8.inc.php3 b/lang/serbian-utf-8.inc.php3 index 8ecc4bd9e..c5c45b134 100644 --- a/lang/serbian-utf-8.inc.php3 +++ b/lang/serbian-utf-8.inc.php3 @@ -639,4 +639,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/serbian-windows-1250.inc.php3 b/lang/serbian-windows-1250.inc.php3 index 292e4c6ee..69856edb8 100644 --- a/lang/serbian-windows-1250.inc.php3 +++ b/lang/serbian-windows-1250.inc.php3 @@ -638,4 +638,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/slovak-iso-8859-2.inc.php3 b/lang/slovak-iso-8859-2.inc.php3 index 052f80a0a..12e559b8d 100644 --- a/lang/slovak-iso-8859-2.inc.php3 +++ b/lang/slovak-iso-8859-2.inc.php3 @@ -610,4 +610,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php3 b/lang/slovak-utf-8.inc.php3 index 52e15056e..0caa2a88a 100644 --- a/lang/slovak-utf-8.inc.php3 +++ b/lang/slovak-utf-8.inc.php3 @@ -611,4 +611,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/slovak-windows-1250.inc.php3 b/lang/slovak-windows-1250.inc.php3 index bc861e0c3..e0f54e20a 100644 --- a/lang/slovak-windows-1250.inc.php3 +++ b/lang/slovak-windows-1250.inc.php3 @@ -610,4 +610,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/slovenian-iso-8859-2.inc.php3 b/lang/slovenian-iso-8859-2.inc.php3 index 5cfccaad6..084a18d84 100644 --- a/lang/slovenian-iso-8859-2.inc.php3 +++ b/lang/slovenian-iso-8859-2.inc.php3 @@ -612,4 +612,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php3 b/lang/slovenian-utf-8.inc.php3 index 720aa3ac6..1ab72b678 100644 --- a/lang/slovenian-utf-8.inc.php3 +++ b/lang/slovenian-utf-8.inc.php3 @@ -613,4 +613,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/slovenian-windows-1250.inc.php3 b/lang/slovenian-windows-1250.inc.php3 index 0325703d7..311a359bb 100644 --- a/lang/slovenian-windows-1250.inc.php3 +++ b/lang/slovenian-windows-1250.inc.php3 @@ -612,4 +612,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/spanish-iso-8859-1.inc.php3 b/lang/spanish-iso-8859-1.inc.php3 index df8069acd..944c0edc6 100644 --- a/lang/spanish-iso-8859-1.inc.php3 +++ b/lang/spanish-iso-8859-1.inc.php3 @@ -613,4 +613,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php3 b/lang/spanish-utf-8.inc.php3 index 910908e72..0a2e01527 100644 --- a/lang/spanish-utf-8.inc.php3 +++ b/lang/spanish-utf-8.inc.php3 @@ -614,4 +614,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/swedish-iso-8859-1.inc.php3 b/lang/swedish-iso-8859-1.inc.php3 index cd97379be..9dcb4767a 100644 --- a/lang/swedish-iso-8859-1.inc.php3 +++ b/lang/swedish-iso-8859-1.inc.php3 @@ -609,4 +609,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php3 b/lang/swedish-utf-8.inc.php3 index 24d3e4a1c..62b8a1650 100644 --- a/lang/swedish-utf-8.inc.php3 +++ b/lang/swedish-utf-8.inc.php3 @@ -610,4 +610,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/thai-tis-620.inc.php3 b/lang/thai-tis-620.inc.php3 index 46cc7b9f5..ce2b23a0e 100644 --- a/lang/thai-tis-620.inc.php3 +++ b/lang/thai-tis-620.inc.php3 @@ -623,4 +623,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php3 b/lang/thai-utf-8.inc.php3 index 8ab19eb37..e122d22d8 100644 --- a/lang/thai-utf-8.inc.php3 +++ b/lang/thai-utf-8.inc.php3 @@ -624,4 +624,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php3 b/lang/turkish-iso-8859-9.inc.php3 index 657c182d6..6ba0286d7 100644 --- a/lang/turkish-iso-8859-9.inc.php3 +++ b/lang/turkish-iso-8859-9.inc.php3 @@ -634,4 +634,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php3 b/lang/turkish-utf-8.inc.php3 index 8feb66ef5..3acc425b5 100644 --- a/lang/turkish-utf-8.inc.php3 +++ b/lang/turkish-utf-8.inc.php3 @@ -635,4 +635,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php3 b/lang/ukrainian-utf-8.inc.php3 index f2219a94b..83a8fd1a3 100644 --- a/lang/ukrainian-utf-8.inc.php3 +++ b/lang/ukrainian-utf-8.inc.php3 @@ -624,4 +624,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/lang/ukrainian-windows-1251.inc.php3 b/lang/ukrainian-windows-1251.inc.php3 index f2f5a7993..54fd15791 100644 --- a/lang/ukrainian-windows-1251.inc.php3 +++ b/lang/ukrainian-windows-1251.inc.php3 @@ -623,4 +623,5 @@ $strStatUpdateTime = 'Last update';//to translate $strStatCheckTime = 'Last check';//to translate $strPerMinute = 'per minute';//to translate $strPerSecond = 'per second';//to translate +$strAutomaticLayout = 'Automatic layout'; //to translate ?> diff --git a/pdf_pages.php3 b/pdf_pages.php3 index 5875a0c19..cfdde5fc5 100755 --- a/pdf_pages.php3 +++ b/pdf_pages.php3 @@ -74,6 +74,100 @@ if ($cfgRelation['pdfwork']) { . ' (db_name, page_descr)' . ' VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($newpage) . '\')'; PMA_query_as_cu($ins_query); + + // A u t o m a t i c l a y o u t + + if (isset($autolayout)) { + // save the page number + $pdf_page_number = mysql_insert_id((isset($dbh)?$dbh:'')); + + // get the tables that have relations, by descending + // number of links + $master_tables = 'SELECT COUNT(master_table), master_table' + . ' FROM ' . PMA_backquote($cfgRelation['relation']) + . ' WHERE master_db = \'' . $db . '\'' + . ' GROUP BY master_table' + . ' ORDER BY ' . PMA_backquote('COUNT(master_table)') . ' DESC '; + $master_tables_rs = PMA_query_as_cu($master_tables); + if ($master_tables_rs && mysql_num_rows($master_tables_rs) > 0) { + // first put all the master tables at beginning + // of the list, so they are near the center of + // the schema + while (list(,$master_table) = mysql_fetch_row($master_tables_rs)) { + $all_tables[] = $master_table; + } + + // then for each master, add its foreigns into an array + // of foreign tables, if not already there + // (a foreign might be foreign for more than + // one table, and might be a master itself) + + $foreign_tables = array(); + while (list(,$master_table) = each($all_tables)) { + $foreigners = PMA_getForeigners($db, $master_table); + while (list(, $foreigner) = each($foreigners)) { + if (!in_array($foreigner['foreign_table'], $foreign_tables)) { + $foreign_tables[] = $foreigner['foreign_table']; + } + } + } + + // then merge the arrays + + while (list(,$foreign_table) = each($foreign_tables)) { + if (!in_array($foreign_table, $all_tables)) { + $all_tables[] = $foreign_table; + } + + } + // now generate the coordinates for the schema, + // in a clockwise spiral + + $pos_x = 500; + $pos_y = 500; + $delta = 50; + $delta_mult = 1.34; + $direction = "right"; + reset($all_tables); + + while (list(,$current_table) = each($all_tables)) { + + // save current table's coordinates + $insert_query = 'INSERT INTO ' . PMA_backquote($cfgRelation['table_coords']) . ' ' + . '(db_name, table_name, pdf_page_number, x, y) ' + . 'VALUES (\'' . PMA_sqlAddslashes($db) . '\', \'' . PMA_sqlAddslashes($current_table) . '\',' . $pdf_page_number . ',' . $pos_x . ',' . $pos_y . ')'; + PMA_query_as_cu($insert_query); + + + // compute for the next table + switch ($direction) { + case 'right': + $pos_x += $delta; + $direction = "down"; + $delta *= $delta_mult; + break; + case 'down': + $pos_y += $delta; + $direction = "left"; + $delta *= $delta_mult; + break; + case 'left': + $pos_x -= $delta; + $direction = "up"; + $delta *= $delta_mult; + break; + case 'up': + $pos_y -= $delta; + $direction = "right"; + $delta *= $delta_mult; + break; + } // end switch + } // end while + } // end if there are master tables + + $chpage = $pdf_page_number; + } // end if isset autolayout + break; case 'edcoord': @@ -166,10 +260,12 @@ if ($cfgRelation['pdfwork']) { + + 0) { echo "\n"; @@ -264,7 +360,14 @@ if ($cfgRelation['pdfwork']) { echo "\n" . '' . "\n\n"; } // end if - if (isset($do) && ($do == 'edcoord' || $do == 'choosepage')) { + // ------------------------------------ + // d i s p l a y p d f s c h e m a + // ------------------------------------ + + if (isset($do) + && ($do == 'edcoord' + || $do == 'choosepage' + || ($do == 'createpage' && isset($chpage)))) { ?>