From 7b96b5841749e407c3f66172465dac48dcf84d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 22 Feb 2006 12:42:35 +0000 Subject: [PATCH] Better message for query export, move operation above query results into one fieldset (bug #1431420). --- ChangeLog | 3 + lang/afrikaans-iso-8859-1.inc.php | 1 + lang/afrikaans-utf-8.inc.php | 1 + lang/albanian-iso-8859-1.inc.php | 1 + lang/albanian-utf-8.inc.php | 1 + lang/arabic-utf-8.inc.php | 1 + lang/arabic-windows-1256.inc.php | 1 + lang/azerbaijani-iso-8859-9.inc.php | 1 + lang/azerbaijani-utf-8.inc.php | 1 + lang/basque-iso-8859-1.inc.php | 1 + lang/basque-utf-8.inc.php | 1 + lang/belarusian_cyrillic-utf-8.inc.php | 1 + lang/belarusian_cyrillic-windows-1251.inc.php | 1 + lang/belarusian_latin-utf-8.inc.php | 1 + lang/bosnian-utf-8.inc.php | 1 + lang/bosnian-windows-1250.inc.php | 1 + lang/brazilian_portuguese-iso-8859-1.inc.php | 1 + lang/brazilian_portuguese-utf-8.inc.php | 1 + lang/bulgarian-koi8-r.inc.php | 1 + lang/bulgarian-utf-8.inc.php | 1 + lang/bulgarian-windows-1251.inc.php | 1 + lang/catalan-iso-8859-1.inc.php | 1 + lang/catalan-utf-8.inc.php | 1 + lang/chinese_simplified-gb2312.inc.php | 1 + lang/chinese_simplified-utf-8.inc.php | 1 + lang/chinese_traditional-big5.inc.php | 1 + lang/chinese_traditional-utf-8.inc.php | 1 + lang/croatian-iso-8859-2.inc.php | 1 + lang/croatian-utf-8.inc.php | 1 + lang/croatian-windows-1250.inc.php | 1 + lang/czech-iso-8859-2.inc.php | 1 + lang/czech-utf-8.inc.php | 1 + lang/czech-windows-1250.inc.php | 1 + lang/danish-iso-8859-1.inc.php | 1 + lang/danish-utf-8.inc.php | 1 + lang/dutch-iso-8859-1.inc.php | 1 + lang/dutch-iso-8859-15.inc.php | 1 + lang/dutch-utf-8.inc.php | 1 + lang/english-iso-8859-1.inc.php | 1 + lang/english-iso-8859-15.inc.php | 1 + lang/english-utf-8.inc.php | 1 + lang/estonian-iso-8859-1.inc.php | 1 + lang/estonian-utf-8.inc.php | 1 + lang/finnish-iso-8859-1.inc.php | 1 + lang/finnish-iso-8859-15.inc.php | 1 + lang/finnish-utf-8.inc.php | 1 + lang/french-iso-8859-1.inc.php | 1 + lang/french-iso-8859-15.inc.php | 1 + lang/french-utf-8.inc.php | 1 + lang/galician-iso-8859-1.inc.php | 1 + lang/galician-utf-8.inc.php | 1 + lang/georgian-utf-8.inc.php | 1 + lang/german-iso-8859-1.inc.php | 1 + lang/german-iso-8859-15.inc.php | 1 + lang/german-utf-8.inc.php | 1 + lang/greek-iso-8859-7.inc.php | 1 + lang/greek-utf-8.inc.php | 1 + lang/hebrew-iso-8859-8-i.inc.php | 1 + lang/hebrew-utf-8.inc.php | 1 + lang/hindi-utf-8.inc.php | 1 + lang/hungarian-iso-8859-2.inc.php | 1 + lang/hungarian-utf-8.inc.php | 1 + lang/indonesian-iso-8859-1.inc.php | 1 + lang/indonesian-utf-8.inc.php | 1 + lang/italian-iso-8859-1.inc.php | 1 + lang/italian-iso-8859-15.inc.php | 1 + lang/italian-utf-8.inc.php | 1 + lang/japanese-euc.inc.php | 1 + lang/japanese-sjis.inc.php | 1 + lang/japanese-utf-8.inc.php | 1 + lang/korean-euc-kr.inc.php | 1 + lang/korean-utf-8.inc.php | 1 + lang/latvian-utf-8.inc.php | 1 + lang/latvian-windows-1257.inc.php | 1 + lang/lithuanian-utf-8.inc.php | 1 + lang/lithuanian-windows-1257.inc.php | 1 + lang/malay-iso-8859-1.inc.php | 1 + lang/malay-utf-8.inc.php | 1 + lang/mongolian-utf-8.inc.php | 1 + lang/norwegian-iso-8859-1.inc.php | 1 + lang/norwegian-utf-8.inc.php | 1 + lang/persian-utf-8.inc.php | 1 + lang/persian-windows-1256.inc.php | 1 + lang/polish-iso-8859-2.inc.php | 1 + lang/polish-utf-8.inc.php | 1 + lang/polish-windows-1250.inc.php | 1 + lang/portuguese-iso-8859-1.inc.php | 1 + lang/portuguese-iso-8859-15.inc.php | 1 + lang/portuguese-utf-8.inc.php | 1 + lang/romanian-iso-8859-1.inc.php | 1 + lang/romanian-utf-8.inc.php | 1 + lang/russian-cp-866.inc.php | 1 + lang/russian-koi8-r.inc.php | 1 + lang/russian-utf-8.inc.php | 1 + lang/russian-windows-1251.inc.php | 1 + lang/serbian_cyrillic-utf-8.inc.php | 1 + lang/serbian_cyrillic-windows-1251.inc.php | 1 + lang/serbian_latin-utf-8.inc.php | 1 + lang/serbian_latin-windows-1250.inc.php | 1 + lang/slovak-iso-8859-2.inc.php | 1 + lang/slovak-utf-8.inc.php | 1 + lang/slovak-windows-1250.inc.php | 1 + lang/slovenian-iso-8859-2.inc.php | 1 + lang/slovenian-utf-8.inc.php | 1 + lang/slovenian-windows-1250.inc.php | 1 + lang/spanish-iso-8859-1.inc.php | 1 + lang/spanish-iso-8859-15.inc.php | 1 + lang/spanish-utf-8.inc.php | 1 + lang/swedish-iso-8859-1.inc.php | 1 + lang/swedish-utf-8.inc.php | 1 + lang/tatarish-iso-8859-9.inc.php | 1 + lang/tatarish-utf-8.inc.php | 1 + lang/thai-tis-620.inc.php | 1 + lang/thai-utf-8.inc.php | 1 + lang/turkish-iso-8859-9.inc.php | 1 + lang/turkish-utf-8.inc.php | 1 + lang/ukrainian-utf-8.inc.php | 1 + lang/ukrainian-windows-1251.inc.php | 1 + libraries/display_tbl.lib.php | 100 +++++++++++++++++- sql.php | 87 --------------- 120 files changed, 219 insertions(+), 88 deletions(-) diff --git a/ChangeLog b/ChangeLog index aadca3600..36639fa5d 100755 --- a/ChangeLog +++ b/ChangeLog @@ -25,6 +25,9 @@ $Source$ * lang/*: Remove unused strTableType, resorted, added missing strings to various translations (timespanfmt was most often missing). * lang/czech: Update. + * sql.php, libraries/display_tbl.lib.php, lang/*: Better message for query + export, move operation above query results into one fieldset (bug + #1431420). 2006-02-22 Sebastian Mendel * libraries/footer.inc.php: diff --git a/lang/afrikaans-iso-8859-1.inc.php b/lang/afrikaans-iso-8859-1.inc.php index b97c5317f..d205ed6a8 100644 --- a/lang/afrikaans-iso-8859-1.inc.php +++ b/lang/afrikaans-iso-8859-1.inc.php @@ -1004,4 +1004,5 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 73ed4076d..db00ebad2 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1005,4 +1005,5 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/albanian-iso-8859-1.inc.php b/lang/albanian-iso-8859-1.inc.php index 4df94167a..0abb29408 100644 --- a/lang/albanian-iso-8859-1.inc.php +++ b/lang/albanian-iso-8859-1.inc.php @@ -1003,4 +1003,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 75bf55cc9..7a2259a3d 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1004,4 +1004,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 3b10df53e..0a6eee2c3 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1006,4 +1006,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/arabic-windows-1256.inc.php b/lang/arabic-windows-1256.inc.php index a88a6845d..bf24f9acb 100644 --- a/lang/arabic-windows-1256.inc.php +++ b/lang/arabic-windows-1256.inc.php @@ -1005,4 +1005,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/azerbaijani-iso-8859-9.inc.php b/lang/azerbaijani-iso-8859-9.inc.php index da5162e3b..aa98633d4 100644 --- a/lang/azerbaijani-iso-8859-9.inc.php +++ b/lang/azerbaijani-iso-8859-9.inc.php @@ -1000,4 +1000,5 @@ $strView = 'View'; //to translate $strWindowNotFound = 'The target browser window could not be updated. Maybe you have closed the parent window or your browser is blocking cross-window updates of your security settings'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 2c40221de..710d13bdd 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1001,4 +1001,5 @@ $strView = 'View'; //to translate $strWindowNotFound = 'The target browser window could not be updated. Maybe you have closed the parent window or your browser is blocking cross-window updates of your security settings'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/basque-iso-8859-1.inc.php b/lang/basque-iso-8859-1.inc.php index ea4e138bf..de8714b7f 100644 --- a/lang/basque-iso-8859-1.inc.php +++ b/lang/basque-iso-8859-1.inc.php @@ -997,4 +997,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 30daa9d14..88c375c5c 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -998,4 +998,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 7b12f08e3..8dcc19ccb 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -984,4 +984,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/belarusian_cyrillic-windows-1251.inc.php b/lang/belarusian_cyrillic-windows-1251.inc.php index 820eee567..3b99f55c7 100644 --- a/lang/belarusian_cyrillic-windows-1251.inc.php +++ b/lang/belarusian_cyrillic-windows-1251.inc.php @@ -983,4 +983,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 47777803e..48f62cae7 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -983,4 +983,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 85ed5327b..057e29fcf 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1004,4 +1004,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/bosnian-windows-1250.inc.php b/lang/bosnian-windows-1250.inc.php index 3a359a0e9..68bf52239 100644 --- a/lang/bosnian-windows-1250.inc.php +++ b/lang/bosnian-windows-1250.inc.php @@ -1003,4 +1003,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php b/lang/brazilian_portuguese-iso-8859-1.inc.php index dfc3dc62f..6fc824653 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php +++ b/lang/brazilian_portuguese-iso-8859-1.inc.php @@ -1003,4 +1003,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 66f6d245e..e06d7ca8d 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1004,4 +1004,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/bulgarian-koi8-r.inc.php b/lang/bulgarian-koi8-r.inc.php index 566b4dea3..caf2d856f 100644 --- a/lang/bulgarian-koi8-r.inc.php +++ b/lang/bulgarian-koi8-r.inc.php @@ -1001,4 +1001,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index c81686fa9..cf1d0ead0 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1002,4 +1002,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/bulgarian-windows-1251.inc.php b/lang/bulgarian-windows-1251.inc.php index 1539b5dfe..14d66f405 100644 --- a/lang/bulgarian-windows-1251.inc.php +++ b/lang/bulgarian-windows-1251.inc.php @@ -1001,4 +1001,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/catalan-iso-8859-1.inc.php b/lang/catalan-iso-8859-1.inc.php index e0877a829..8f0ea23a3 100644 --- a/lang/catalan-iso-8859-1.inc.php +++ b/lang/catalan-iso-8859-1.inc.php @@ -981,4 +981,5 @@ $strSQLCompatibility = 'SQL compatibility mode'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index a82fcc4cf..86b01e486 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -982,4 +982,5 @@ $strSQLCompatibility = 'SQL compatibility mode'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/chinese_simplified-gb2312.inc.php b/lang/chinese_simplified-gb2312.inc.php index f984f7b0b..d3569eb06 100644 --- a/lang/chinese_simplified-gb2312.inc.php +++ b/lang/chinese_simplified-gb2312.inc.php @@ -1003,4 +1003,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 82e5960b1..dd1bba572 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1004,4 +1004,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/chinese_traditional-big5.inc.php b/lang/chinese_traditional-big5.inc.php index a93393a5e..185b666ea 100644 --- a/lang/chinese_traditional-big5.inc.php +++ b/lang/chinese_traditional-big5.inc.php @@ -1001,4 +1001,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 6ea3ca13e..e5abb635a 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1002,4 +1002,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/croatian-iso-8859-2.inc.php b/lang/croatian-iso-8859-2.inc.php index f7d50f5ed..df6e92ea7 100644 --- a/lang/croatian-iso-8859-2.inc.php +++ b/lang/croatian-iso-8859-2.inc.php @@ -1001,4 +1001,5 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index b0cf55385..4538685ed 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1002,4 +1002,5 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/croatian-windows-1250.inc.php b/lang/croatian-windows-1250.inc.php index 876540d5d..52b709589 100644 --- a/lang/croatian-windows-1250.inc.php +++ b/lang/croatian-windows-1250.inc.php @@ -1001,4 +1001,5 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/czech-iso-8859-2.inc.php b/lang/czech-iso-8859-2.inc.php index c8b8bd1db..5d2cae6d5 100644 --- a/lang/czech-iso-8859-2.inc.php +++ b/lang/czech-iso-8859-2.inc.php @@ -979,4 +979,5 @@ $strYes = 'Ano'; $strZeroRemovesTheLimit = 'Poznámka: Nastavení těchto parametrů na 0 (nulu) odstraní omezení.'; $strZip = '„zazipováno“'; +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index c874bb387..00aaf86a3 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -980,4 +980,5 @@ $strYes = 'Ano'; $strZeroRemovesTheLimit = 'Poznámka: NastavenĂ­ tÄ›chto parametrĹŻ na 0 (nulu) odstranĂ­ omezenĂ­.'; $strZip = '„zazipováno“'; +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/czech-windows-1250.inc.php b/lang/czech-windows-1250.inc.php index 956347af5..651272a4c 100644 --- a/lang/czech-windows-1250.inc.php +++ b/lang/czech-windows-1250.inc.php @@ -979,4 +979,5 @@ $strYes = 'Ano'; $strZeroRemovesTheLimit = 'Poznámka: Nastavení těchto parametrů na 0 (nulu) odstraní omezení.'; $strZip = '„zazipováno“'; +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/danish-iso-8859-1.inc.php b/lang/danish-iso-8859-1.inc.php index d059107a1..75b8bc0bd 100644 --- a/lang/danish-iso-8859-1.inc.php +++ b/lang/danish-iso-8859-1.inc.php @@ -977,4 +977,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 5f5dfdb59..f26c22cff 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -978,4 +978,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/dutch-iso-8859-1.inc.php b/lang/dutch-iso-8859-1.inc.php index 2ee951722..bdd61c540 100644 --- a/lang/dutch-iso-8859-1.inc.php +++ b/lang/dutch-iso-8859-1.inc.php @@ -1001,4 +1001,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/dutch-iso-8859-15.inc.php b/lang/dutch-iso-8859-15.inc.php index 0775ed650..d7a2e31ac 100644 --- a/lang/dutch-iso-8859-15.inc.php +++ b/lang/dutch-iso-8859-15.inc.php @@ -1001,4 +1001,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index e30ec879b..2c2ec590d 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1002,4 +1002,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php b/lang/english-iso-8859-1.inc.php index 310cbac54..e9db17caa 100644 --- a/lang/english-iso-8859-1.inc.php +++ b/lang/english-iso-8859-1.inc.php @@ -604,6 +604,7 @@ $strQBE = 'Query'; $strQueryCache = 'Query cache'; $strQueryFrame = 'Query window'; $strQueryOnDb = 'SQL query on database %s:'; +$strQueryResultsOperations = 'Query results operations'; $strQuerySQLHistory = 'SQL history'; $strQueryStatistics = 'Query statistics: Since its startup, %s queries have been sent to the server.'; $strQueryTime = 'Query took %01.4f sec'; diff --git a/lang/english-iso-8859-15.inc.php b/lang/english-iso-8859-15.inc.php index b41ed6eb9..e33021ee8 100644 --- a/lang/english-iso-8859-15.inc.php +++ b/lang/english-iso-8859-15.inc.php @@ -604,6 +604,7 @@ $strQBE = 'Query'; $strQueryCache = 'Query cache'; $strQueryFrame = 'Query window'; $strQueryOnDb = 'SQL query on database %s:'; +$strQueryResultsOperations = 'Query results operations'; $strQuerySQLHistory = 'SQL history'; $strQueryStatistics = 'Query statistics: Since its startup, %s queries have been sent to the server.'; $strQueryTime = 'Query took %01.4f sec'; diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index a20f7160b..216ae984a 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -605,6 +605,7 @@ $strQBE = 'Query'; $strQueryCache = 'Query cache'; $strQueryFrame = 'Query window'; $strQueryOnDb = 'SQL query on database %s:'; +$strQueryResultsOperations = 'Query results operations'; $strQuerySQLHistory = 'SQL history'; $strQueryStatistics = 'Query statistics: Since its startup, %s queries have been sent to the server.'; $strQueryTime = 'Query took %01.4f sec'; diff --git a/lang/estonian-iso-8859-1.inc.php b/lang/estonian-iso-8859-1.inc.php index ab3cdab5c..5a309c55e 100644 --- a/lang/estonian-iso-8859-1.inc.php +++ b/lang/estonian-iso-8859-1.inc.php @@ -981,4 +981,5 @@ $strThemePathNotFound = 'Theme path not found for theme %s!'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index e5742f650..a0f020348 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -982,4 +982,5 @@ $strThemePathNotFound = 'Theme path not found for theme %s!'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php b/lang/finnish-iso-8859-1.inc.php index d35550e87..0105b68c4 100644 --- a/lang/finnish-iso-8859-1.inc.php +++ b/lang/finnish-iso-8859-1.inc.php @@ -989,4 +989,5 @@ $strSQLCompatibility = 'SQL compatibility mode'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/finnish-iso-8859-15.inc.php b/lang/finnish-iso-8859-15.inc.php index 3e096b524..b7754003f 100644 --- a/lang/finnish-iso-8859-15.inc.php +++ b/lang/finnish-iso-8859-15.inc.php @@ -989,4 +989,5 @@ $strSQLCompatibility = 'SQL compatibility mode'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 62c159ffc..4b02a29c1 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -990,4 +990,5 @@ $strSQLCompatibility = 'SQL compatibility mode'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/french-iso-8859-1.inc.php b/lang/french-iso-8859-1.inc.php index 656d2c694..2e86b3eb9 100644 --- a/lang/french-iso-8859-1.inc.php +++ b/lang/french-iso-8859-1.inc.php @@ -978,4 +978,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/french-iso-8859-15.inc.php b/lang/french-iso-8859-15.inc.php index f5bd789da..fe6fcf213 100644 --- a/lang/french-iso-8859-15.inc.php +++ b/lang/french-iso-8859-15.inc.php @@ -978,4 +978,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 0df93952b..95e53357c 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -979,4 +979,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/galician-iso-8859-1.inc.php b/lang/galician-iso-8859-1.inc.php index 5a616bf3f..c8a76e4d5 100644 --- a/lang/galician-iso-8859-1.inc.php +++ b/lang/galician-iso-8859-1.inc.php @@ -987,4 +987,5 @@ $strThemePathNotFound = 'Theme path not found for theme %s!'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 1c71fac95..3cae4f8b3 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -988,4 +988,5 @@ $strThemePathNotFound = 'Theme path not found for theme %s!'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index a4107269d..863fb28fb 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1006,4 +1006,5 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/german-iso-8859-1.inc.php b/lang/german-iso-8859-1.inc.php index cb686cac0..a17682512 100644 --- a/lang/german-iso-8859-1.inc.php +++ b/lang/german-iso-8859-1.inc.php @@ -991,4 +991,5 @@ $strUploadLimit = 'M $strViewMaxExactCount = 'Dieses View hat mehr als %d Zeilen. Bitte schlagen Sie im %sHandbuch%s nach.'; //recently translated +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/german-iso-8859-15.inc.php b/lang/german-iso-8859-15.inc.php index 8ab366400..427469548 100644 --- a/lang/german-iso-8859-15.inc.php +++ b/lang/german-iso-8859-15.inc.php @@ -991,4 +991,5 @@ $strUploadLimit = 'M $strViewMaxExactCount = 'Dieses View hat mehr als %d Zeilen. Bitte schlagen Sie im %sHandbuch%s nach.'; //recently translated +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index c004fbd62..878cc9c5b 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -992,4 +992,5 @@ $strUploadLimit = 'Möglicherweise wurde eine zu groĂźe Datei hochgeladen. Bitte $strViewMaxExactCount = 'Dieses View hat mehr als %d Zeilen. Bitte schlagen Sie im %sHandbuch%s nach.'; //recently translated +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/greek-iso-8859-7.inc.php b/lang/greek-iso-8859-7.inc.php index fc097a687..9373257d8 100644 --- a/lang/greek-iso-8859-7.inc.php +++ b/lang/greek-iso-8859-7.inc.php @@ -1002,4 +1002,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 64ddd79b0..1471605c0 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1003,4 +1003,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php b/lang/hebrew-iso-8859-8-i.inc.php index 3336a8b88..c0a181a29 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php +++ b/lang/hebrew-iso-8859-8-i.inc.php @@ -997,4 +997,5 @@ $strWebServerUploadDirectory = 'web server upload directory'; //to translate $strWestEuropean = 'West European'; //to translate $strWindowNotFound = 'The target browser window could not be updated. Maybe you have closed the parent window, or your browser\'s security settings are configured to block cross-window updates.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 2ad0f13ba..00b0b0b74 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -998,4 +998,5 @@ $strWebServerUploadDirectory = 'web server upload directory'; //to translate $strWestEuropean = 'West European'; //to translate $strWindowNotFound = 'The target browser window could not be updated. Maybe you have closed the parent window, or your browser\'s security settings are configured to block cross-window updates.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index cc4b65736..6c5b51c53 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1006,4 +1006,5 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate $strZip = '"zipped"' ; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/hungarian-iso-8859-2.inc.php b/lang/hungarian-iso-8859-2.inc.php index 35868b216..d1e45a1f6 100644 --- a/lang/hungarian-iso-8859-2.inc.php +++ b/lang/hungarian-iso-8859-2.inc.php @@ -997,4 +997,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index c55d6f448..76d8dfa24 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -998,4 +998,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/indonesian-iso-8859-1.inc.php b/lang/indonesian-iso-8859-1.inc.php index 9e20487d0..7ea0ff7d2 100644 --- a/lang/indonesian-iso-8859-1.inc.php +++ b/lang/indonesian-iso-8859-1.inc.php @@ -995,4 +995,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 481784a40..f74a278b7 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -996,4 +996,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/italian-iso-8859-1.inc.php b/lang/italian-iso-8859-1.inc.php index 72df9741c..2267b545c 100644 --- a/lang/italian-iso-8859-1.inc.php +++ b/lang/italian-iso-8859-1.inc.php @@ -983,4 +983,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/italian-iso-8859-15.inc.php b/lang/italian-iso-8859-15.inc.php index 8170ce27c..1f153a691 100644 --- a/lang/italian-iso-8859-15.inc.php +++ b/lang/italian-iso-8859-15.inc.php @@ -983,4 +983,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index e467976ba..ffa69b033 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -984,4 +984,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/japanese-euc.inc.php b/lang/japanese-euc.inc.php index 7851d85ad..7d865f2a8 100644 --- a/lang/japanese-euc.inc.php +++ b/lang/japanese-euc.inc.php @@ -987,4 +987,5 @@ $strShowStatusSort_rangeDescr = 'The number of sorts that were done with ranges. $strShowStatusTable_locks_waitedDescr = 'The number of times that a table lock could not be acquired immediately and a wait was needed. If this is high, and you have performance problems, you should first optimize your queries, and then either split your table or tables or use replication.'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php b/lang/japanese-sjis.inc.php index f76e17e62..933c2da95 100644 --- a/lang/japanese-sjis.inc.php +++ b/lang/japanese-sjis.inc.php @@ -987,4 +987,5 @@ $strShowStatusSort_rangeDescr = 'The number of sorts that were done with ranges. $strShowStatusTable_locks_waitedDescr = 'The number of times that a table lock could not be acquired immediately and a wait was needed. If this is high, and you have performance problems, you should first optimize your queries, and then either split your table or tables or use replication.'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 8000a2dfe..d2d202805 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -988,4 +988,5 @@ $strShowStatusSort_rangeDescr = 'The number of sorts that were done with ranges. $strShowStatusTable_locks_waitedDescr = 'The number of times that a table lock could not be acquired immediately and a wait was needed. If this is high, and you have performance problems, you should first optimize your queries, and then either split your table or tables or use replication.'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/korean-euc-kr.inc.php b/lang/korean-euc-kr.inc.php index cbc86658a..e702cba31 100644 --- a/lang/korean-euc-kr.inc.php +++ b/lang/korean-euc-kr.inc.php @@ -1000,4 +1000,5 @@ $strWritingRelationNotPossible = 'Writing of relation not possible'; //to trans $strXML = 'XML';//to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 8cdc30e4d..29f0d5753 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1001,4 +1001,5 @@ $strWritingRelationNotPossible = 'Writing of relation not possible'; //to trans $strXML = 'XML';//to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 2ffea0802..d9810c500 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1003,4 +1003,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/latvian-windows-1257.inc.php b/lang/latvian-windows-1257.inc.php index e1cfef433..e2ad802a5 100644 --- a/lang/latvian-windows-1257.inc.php +++ b/lang/latvian-windows-1257.inc.php @@ -1002,4 +1002,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 590d74778..b38f95907 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -996,4 +996,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/lithuanian-windows-1257.inc.php b/lang/lithuanian-windows-1257.inc.php index da199bb4d..8043f3815 100644 --- a/lang/lithuanian-windows-1257.inc.php +++ b/lang/lithuanian-windows-1257.inc.php @@ -995,4 +995,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/malay-iso-8859-1.inc.php b/lang/malay-iso-8859-1.inc.php index 1580b6223..b2d78820e 100644 --- a/lang/malay-iso-8859-1.inc.php +++ b/lang/malay-iso-8859-1.inc.php @@ -1017,4 +1017,5 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index d82f0b5d7..1bb4c8daa 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1018,4 +1018,5 @@ $strXML = 'XML';//to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 8b113e13e..ed2b6e49a 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1001,4 +1001,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/norwegian-iso-8859-1.inc.php b/lang/norwegian-iso-8859-1.inc.php index 87c1f449b..570766b02 100644 --- a/lang/norwegian-iso-8859-1.inc.php +++ b/lang/norwegian-iso-8859-1.inc.php @@ -981,4 +981,5 @@ $strShowStatusHandler_read_prevDescr = 'The number of requests to read the previ $strShowStatusHandler_read_rndDescr = 'The number of requests to read a row based on a fixed position. This is high if you are doing a lot of queries that require sorting of the result. You probably have a lot of queries that require MySQL to scan whole tables or you have joins that don\'t use keys properly.'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index df0cb2639..9abdde8a3 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -982,4 +982,5 @@ $strShowStatusHandler_read_prevDescr = 'The number of requests to read the previ $strShowStatusHandler_read_rndDescr = 'The number of requests to read a row based on a fixed position. This is high if you are doing a lot of queries that require sorting of the result. You probably have a lot of queries that require MySQL to scan whole tables or you have joins that don\'t use keys properly.'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index eb45fd164..0b6c14e25 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1003,4 +1003,5 @@ $strXML = 'XML'; //to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/persian-windows-1256.inc.php b/lang/persian-windows-1256.inc.php index 142783ae5..d0a04e1dc 100644 --- a/lang/persian-windows-1256.inc.php +++ b/lang/persian-windows-1256.inc.php @@ -1002,4 +1002,5 @@ $strXML = 'XML'; //to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/polish-iso-8859-2.inc.php b/lang/polish-iso-8859-2.inc.php index 82cff9754..df0362986 100644 --- a/lang/polish-iso-8859-2.inc.php +++ b/lang/polish-iso-8859-2.inc.php @@ -977,4 +977,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 8d5e38ac2..bde1a5710 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -978,4 +978,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/polish-windows-1250.inc.php b/lang/polish-windows-1250.inc.php index 62c4c6181..1d15474a1 100644 --- a/lang/polish-windows-1250.inc.php +++ b/lang/polish-windows-1250.inc.php @@ -977,4 +977,5 @@ $strReloadPrivileges = 'Reload privileges'; //to translate $strSQLCompatibility = 'SQL compatibility mode'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/portuguese-iso-8859-1.inc.php b/lang/portuguese-iso-8859-1.inc.php index a9a592091..54f84263e 100644 --- a/lang/portuguese-iso-8859-1.inc.php +++ b/lang/portuguese-iso-8859-1.inc.php @@ -1004,4 +1004,5 @@ $strWildcard = 'wildcard'; //to translate $strWindowNotFound = 'The target browser window could not be updated. Maybe you have closed the parent window or your browser is blocking cross-window updates of your security settings'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/portuguese-iso-8859-15.inc.php b/lang/portuguese-iso-8859-15.inc.php index 8b396fa07..e0bd0477b 100644 --- a/lang/portuguese-iso-8859-15.inc.php +++ b/lang/portuguese-iso-8859-15.inc.php @@ -1004,4 +1004,5 @@ $strWildcard = 'wildcard'; //to translate $strWindowNotFound = 'The target browser window could not be updated. Maybe you have closed the parent window or your browser is blocking cross-window updates of your security settings'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index e8db21d28..cb96159a1 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1005,4 +1005,5 @@ $strWildcard = 'wildcard'; //to translate $strWindowNotFound = 'The target browser window could not be updated. Maybe you have closed the parent window or your browser is blocking cross-window updates of your security settings'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/romanian-iso-8859-1.inc.php b/lang/romanian-iso-8859-1.inc.php index 4857472a3..9b1119c19 100644 --- a/lang/romanian-iso-8859-1.inc.php +++ b/lang/romanian-iso-8859-1.inc.php @@ -998,4 +998,5 @@ $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocu $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index cb1a48c91..83fb11b2c 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -999,4 +999,5 @@ $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocu $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/russian-cp-866.inc.php b/lang/russian-cp-866.inc.php index 81769c1a2..d231d4b29 100644 --- a/lang/russian-cp-866.inc.php +++ b/lang/russian-cp-866.inc.php @@ -1004,4 +1004,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php b/lang/russian-koi8-r.inc.php index 169a07e89..567d1eeae 100644 --- a/lang/russian-koi8-r.inc.php +++ b/lang/russian-koi8-r.inc.php @@ -1005,4 +1005,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 6b45f330c..b7220712e 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1006,4 +1006,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/russian-windows-1251.inc.php b/lang/russian-windows-1251.inc.php index 2ec06b17c..e4e651d49 100644 --- a/lang/russian-windows-1251.inc.php +++ b/lang/russian-windows-1251.inc.php @@ -1005,4 +1005,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index d943ce1ce..f4ddf167d 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1002,4 +1002,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/serbian_cyrillic-windows-1251.inc.php b/lang/serbian_cyrillic-windows-1251.inc.php index b462413c4..96c3d1de0 100644 --- a/lang/serbian_cyrillic-windows-1251.inc.php +++ b/lang/serbian_cyrillic-windows-1251.inc.php @@ -1001,4 +1001,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index e0a408c4b..8f7661638 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1002,4 +1002,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/serbian_latin-windows-1250.inc.php b/lang/serbian_latin-windows-1250.inc.php index e03c7a5ea..7e2f270d8 100644 --- a/lang/serbian_latin-windows-1250.inc.php +++ b/lang/serbian_latin-windows-1250.inc.php @@ -1001,4 +1001,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/slovak-iso-8859-2.inc.php b/lang/slovak-iso-8859-2.inc.php index 30a55adff..2b501937c 100644 --- a/lang/slovak-iso-8859-2.inc.php +++ b/lang/slovak-iso-8859-2.inc.php @@ -991,4 +991,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 7e5cce2c0..b0ef7c8ea 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -992,4 +992,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/slovak-windows-1250.inc.php b/lang/slovak-windows-1250.inc.php index c13b9d8e0..76db0ea42 100644 --- a/lang/slovak-windows-1250.inc.php +++ b/lang/slovak-windows-1250.inc.php @@ -991,4 +991,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/slovenian-iso-8859-2.inc.php b/lang/slovenian-iso-8859-2.inc.php index afdd300c5..2cee8c907 100644 --- a/lang/slovenian-iso-8859-2.inc.php +++ b/lang/slovenian-iso-8859-2.inc.php @@ -999,4 +999,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 0fbb681ec..14beadc09 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1000,4 +1000,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/slovenian-windows-1250.inc.php b/lang/slovenian-windows-1250.inc.php index 7764bdfc9..70c9bcea2 100644 --- a/lang/slovenian-windows-1250.inc.php +++ b/lang/slovenian-windows-1250.inc.php @@ -999,4 +999,5 @@ $strView = 'View'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/spanish-iso-8859-1.inc.php b/lang/spanish-iso-8859-1.inc.php index d91e14758..08b22797f 100644 --- a/lang/spanish-iso-8859-1.inc.php +++ b/lang/spanish-iso-8859-1.inc.php @@ -988,4 +988,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/spanish-iso-8859-15.inc.php b/lang/spanish-iso-8859-15.inc.php index 5770a046f..20bc5c989 100644 --- a/lang/spanish-iso-8859-15.inc.php +++ b/lang/spanish-iso-8859-15.inc.php @@ -988,4 +988,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 1e0d50a66..fada508be 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -989,4 +989,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/swedish-iso-8859-1.inc.php b/lang/swedish-iso-8859-1.inc.php index c034b311a..b7d2dbf38 100644 --- a/lang/swedish-iso-8859-1.inc.php +++ b/lang/swedish-iso-8859-1.inc.php @@ -992,4 +992,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 01f97a5e2..5766ecb89 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -993,4 +993,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/tatarish-iso-8859-9.inc.php b/lang/tatarish-iso-8859-9.inc.php index 096cbf99d..d39da2904 100644 --- a/lang/tatarish-iso-8859-9.inc.php +++ b/lang/tatarish-iso-8859-9.inc.php @@ -997,4 +997,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 87cff90ca..002572f7d 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -997,4 +997,5 @@ $strUsedPhpExtensions = 'Used PHP extensions'; //to translate $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocumentation%s.'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/thai-tis-620.inc.php b/lang/thai-tis-620.inc.php index 5d0578d1b..0cb0be909 100644 --- a/lang/thai-tis-620.inc.php +++ b/lang/thai-tis-620.inc.php @@ -1001,4 +1001,5 @@ $strView = 'View'; //to translate $strWindowNotFound = 'The target browser window could not be updated. Maybe you have closed the parent window or your browser is blocking cross-window updates of your security settings'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 5f1bf65f2..1a6c6a260 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1002,4 +1002,5 @@ $strView = 'View'; //to translate $strWindowNotFound = 'The target browser window could not be updated. Maybe you have closed the parent window or your browser is blocking cross-window updates of your security settings'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php b/lang/turkish-iso-8859-9.inc.php index ca4c206be..4b7b1682a 100644 --- a/lang/turkish-iso-8859-9.inc.php +++ b/lang/turkish-iso-8859-9.inc.php @@ -1026,4 +1026,5 @@ $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocu $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index ef8f90d32..ce1a770de 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1027,4 +1027,5 @@ $strViewMaxExactCount = 'This view has more than %s rows. Please refer to %sdocu $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index e1e4ca621..b0e9ce80b 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1000,4 +1000,5 @@ $strView = 'View'; //to translate $strWindowNotFound = 'The target browser window could not be updated. Maybe you have closed the parent window or your browser is blocking cross-window updates of your security settings'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/lang/ukrainian-windows-1251.inc.php b/lang/ukrainian-windows-1251.inc.php index affdab084..85cf83c58 100644 --- a/lang/ukrainian-windows-1251.inc.php +++ b/lang/ukrainian-windows-1251.inc.php @@ -999,4 +999,5 @@ $strView = 'View'; //to translate $strWindowNotFound = 'The target browser window could not be updated. Maybe you have closed the parent window or your browser is blocking cross-window updates of your security settings'; //to translate $strWriteRequests = 'Write requests'; //to translate +$strQueryResultsOperations = 'Query results operations'; //to translate ?> diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 206a348e6..d837e7945 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -1667,7 +1667,7 @@ function PMA_displayVerticalTable() * * @see PMA_showMessage(), PMA_setDisplayMode(), * PMA_displayTableNavigation(), PMA_displayTableHeaders(), - * PMA_displayTableBody() + * PMA_displayTableBody(), PMA_displayResultsOperations() */ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) { @@ -1724,6 +1724,7 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) echo PMA_sanitize(sprintf($GLOBALS['strViewMaxExactCount'], PMA_formatNumber($GLOBALS['cfg']['MaxExactCount'], 0), '[a@./Documentation.html#cfg_MaxExactCount@_blank]', '[/a]')) . "\n"; echo '' . "\n"; } + } elseif (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { PMA_showMessage($GLOBALS['strSQLQuery']); } @@ -1740,6 +1741,9 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql) $table = ''; } } + if (!isset($GLOBALS['printview']) || $GLOBALS['printview'] != '1') { + PMA_displayResultsOperations($the_disp_mode, $analyzed_sql); + } if ($is_display['nav_bar'] == '1') { PMA_displayTableNavigation($pos_next, $pos_prev, $encoded_sql_query); echo "\n"; @@ -1883,4 +1887,98 @@ function default_function($buffer) { return $buffer; } + +/** + * Displays operations that are available on results. + * + * @param array the display mode + * @param array the analyzed query + * + * @global string $db the database name + * @global string $table the table name + * @global boolean $dontlimitchars whether to limit the number of displayed + * characters of text type fields or not + * @global integer $pos the current postion of the first record + * to be displayed + * @global string $sql_query the current sql query + * @global integer $unlim_num_rows the total number of rows returned by the + * sql query without any programmatically + * appended "LIMIT" clause + * @global string $disp_direction the display mode + * (horizontal/vertical/horizontalflipped) + * @global integer $repeat_cells the number of row to display between two + * table headers + * + * @access private + * + * @see PMA_showMessage(), PMA_setDisplayMode(), + * PMA_displayTableNavigation(), PMA_displayTableHeaders(), + * PMA_displayTableBody(), PMA_displayResultsOperations() + */ +function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { + global $db, $table, $dontlimitchars, $pos, $sql_query, $unlim_num_rows, $disp_direction, $repeat_cells; + + $header_shown = FALSE; + $header = '
' . $GLOBALS['strQueryResultsOperations'] . ''; + + if ($the_disp_mode[6] == '1' || $the_disp_mode[9] == '1') { + // Displays "printable view" link if required + if ($the_disp_mode[9] == '1') { + + if (!$header_shown) { + echo $header; + $header_shown = TRUE; + } + + $url_query = '?' + . PMA_generate_common_url($db, $table) + . '&pos=' . $pos + . '&session_max_rows=' . $GLOBALS['session_max_rows'] + . '&disp_direction=' . $disp_direction + . '&repeat_cells=' . $repeat_cells + . '&printview=1' + . '&sql_query=' . urlencode($sql_query); + echo ' ' . "\n"; + echo PMA_linkOrButton( + 'sql.php' . $url_query . ((isset($dontlimitchars) && $dontlimitchars == '1') ? '&dontlimitchars=1' : ''), + ($GLOBALS['cfg']['PropertiesIconic'] ? '' . $GLOBALS['strPrintView'] . '' : '') . $GLOBALS['strPrintView'], + '', true, true, 'print_view') . "\n"; + + if (!$dontlimitchars) { + echo '   ' . "\n"; + echo PMA_linkOrButton( + 'sql.php' . $url_query . '&dontlimitchars=1', + ($GLOBALS['cfg']['PropertiesIconic'] ? '' . $GLOBALS['strPrintViewFull'] . '' : '') . $GLOBALS['strPrintViewFull'], + '', true, true, 'print_view') . "\n"; + } + } // end displays "printable view" + + echo "\n"; + } + + // Export link + // (the url_query has extra parameters that won't be used to export) + // (the single_table parameter is used in display_export.lib.php + // to hide the SQL and the structure export dialogs) + if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && !isset($printview)) { + if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && !isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) { + $single_table = '&single_table=true'; + } else { + $single_table = ''; + } + if (!$header_shown) { + echo $header; + $header_shown = TRUE; + } + echo ' ' . "\n"; + echo '   ' . "\n"; + echo PMA_linkOrButton( + 'tbl_properties_export.php' . $url_query . '&unlim_num_rows=' . $unlim_num_rows . $single_table, + ($GLOBALS['cfg']['PropertiesIconic'] ? '' . $GLOBALS['strExport'] . '' : '') . $GLOBALS['strExport'], + '', true, true, '') . "\n"; + } + if ($header_shown) { + echo '

'; + } +} ?> diff --git a/sql.php b/sql.php index 54a2cc2b8..ba9974139 100644 --- a/sql.php +++ b/sql.php @@ -769,88 +769,6 @@ else { } } // End INDEX CHECK - if ($disp_mode[6] == '1' || $disp_mode[9] == '1') { - echo "\n"; - echo '
' . "\n"; - - // Displays "Insert a new row" link if required - if ($disp_mode[6] == '1') { - $lnk_goto = 'sql.php?' - . PMA_generate_common_url($db, $table) - . '&pos=' . $pos - . '&session_max_rows=' . $session_max_rows - . '&disp_direction=' . $disp_direction - . '&repeat_cells=' . $repeat_cells - . '&dontlimitchars=' . $dontlimitchars - . '&sql_query=' . urlencode($sql_query); - $url_query = '?' - . PMA_generate_common_url($db, $table) - . '&pos=' . $pos - . '&session_max_rows=' . $session_max_rows - . '&disp_direction=' . $disp_direction - . '&repeat_cells=' . $repeat_cells - . '&dontlimitchars=' . $dontlimitchars - . '&sql_query=' . urlencode($sql_query) - . '&goto=' . urlencode($lnk_goto); - - echo ' ' . "\n"; - echo PMA_linkOrButton( - 'tbl_change.php' . $url_query, - ($cfg['PropertiesIconic'] ? '' . $strInsertNewRow . '' : '') . $strInsertNewRow, - '', true, true, '') . "\n"; - - if ($disp_mode[9] == '1') { - echo '  '; - } - echo "\n"; - } // end insert new row - - // Displays "printable view" link if required - if ($disp_mode[9] == '1') { - $url_query = '?' - . PMA_generate_common_url($db, $table) - . '&pos=' . $pos - . '&session_max_rows=' . $session_max_rows - . '&disp_direction=' . $disp_direction - . '&repeat_cells=' . $repeat_cells - . '&printview=1' - . '&sql_query=' . urlencode($sql_query); - echo ' ' . "\n"; - echo PMA_linkOrButton( - 'sql.php' . $url_query . ((isset($dontlimitchars) && $dontlimitchars == '1') ? '&dontlimitchars=1' : ''), - ($cfg['PropertiesIconic'] ? '' . $strPrintView . '' : '') . $strPrintView, - '', true, true, 'print_view') . "\n"; - - if (!$dontlimitchars) { - echo '   ' . "\n"; - echo PMA_linkOrButton( - 'sql.php' . $url_query . '&dontlimitchars=1', - ($cfg['PropertiesIconic'] ? '' . $strPrintViewFull . '' : '') . $strPrintViewFull, - '', true, true, 'print_view') . "\n"; - } - } // end displays "printable view" - - echo "\n"; - } - - // Export link - // (the url_query has extra parameters that won't be used to export) - // (the single_table parameter is used in display_export.lib.php - // to hide the SQL and the structure export dialogs) - if (isset($analyzed_sql[0]) && $analyzed_sql[0]['querytype'] == 'SELECT' && !isset($printview)) { - if (isset($analyzed_sql[0]['table_ref'][0]['table_true_name']) && !isset($analyzed_sql[0]['table_ref'][1]['table_true_name'])) { - $single_table = '&single_table=true'; - } else { - $single_table = ''; - } - echo ' ' . "\n"; - echo '   ' . "\n"; - echo PMA_linkOrButton( - 'tbl_properties_export.php' . $url_query . '&unlim_num_rows=' . $unlim_num_rows . $single_table, - ($cfg['PropertiesIconic'] ? '' . $strExport . '' : '') . $strExport, - '', true, true, '') . "\n"; - } - // Bookmark Support if required if ($disp_mode[7] == '1' && (isset($cfg['Bookmark']) && $cfg['Bookmark']['db'] && $cfg['Bookmark']['table'] && empty($id_bookmark)) @@ -867,11 +785,6 @@ else { . '&sql_query=' . urlencode($sql_query) . '&id_bookmark=1'; - if ($disp_mode[3] == '1') { - echo ' ' . $strOr . ''; - } else { - echo '

'; - } ?>