diff --git a/ChangeLog b/ChangeLog index d40271355..60ce94c97 100755 --- a/ChangeLog +++ b/ChangeLog @@ -6,11 +6,23 @@ $Id$ $Source$ 2003-06-03 Garvin Hicking + * lang/*, tbl_query_box.php3, Documentation.html, footer.inc.php3: + (Experimental) + New feature - The automatic update of the query window seems to + cause some headache for users. They type in their query, want to + look in a different table for some fields, want to switch back to + their browser window and the changes are lost because the last table + is always filled in. Now we have a checkbox to preserve the edited + content from any update outside of the window. It is automatically + checked by editing the contents of the query textarea and can be + unchecked to restore previous behaviour. Thanks to Alexander Meis + for this suggestion. Optionally we could build in a config variable + to override this 'onChange' effect, but I guess it's not necessary. * libraries/display_tbl.lib.php3: Bug #748084 - Use preg_replace instead - of ereg_replace, because it interprets \0, \1 and so on not as strings - but as regex-subpatterns and fails to convert those strings correctly. - We'll have to see if that can be the case on other usages of preg_replace - as well. + of ereg_replace, because it interprets \0, \1 and so on not as strings + but as regex-subpatterns and fails to convert those strings correctly. + We'll have to see if that can be the case on other usages of + preg_replace as well. 2003-06-02 Alexander M. Turek * server_status.php3: RFE #723325 (Move total query statistics). diff --git a/Documentation.html b/Documentation.html index 513032a6e..25baf8630 100755 --- a/Documentation.html +++ b/Documentation.html @@ -1599,7 +1599,13 @@ $cfg['PmaAbsoluteUri'] = (!empty($_SERVER['HTTPS']) ? 'https' : 'http') . '://' as your window is opened they remain saved.

When using the JavaScript based query window, it will always get updated when you click on a new table/db to browse and will focus if you click on "Edit SQL" after - using a query.

+ using a query. You can suppress updating the query window by checking the box + "Do not overwrite this query from outside the window" below the query textarea. Then + you can browse tables/databases in the background without losing the contents of the + textarea, so this is especially useful when composing a query with tables you first + have to look in. The checkbox will get automatically checked whenever you change the + contents of the textarea. Please uncheck the button whenever you definitely want the + query window to get updated even though you have made alterations.

If $cfg['QueryHistoryDB'] is set to TRUE you can specify the amount of saved history items using $cfg['QueryHistoryMax'].

The query window also has a custom tabbed look to group the features. Using the @@ -3180,8 +3186,6 @@ To create a new, empty mimetype please see libraries/transformations/template_ge

- -

[7. phpMyAdmin project]

diff --git a/footer.inc.php3 b/footer.inc.php3 index 37573fc4a..d80c2dc6e 100755 --- a/footer.inc.php3 +++ b/footer.inc.php3 @@ -41,15 +41,17 @@ if ($cfg['QueryFrame'] && $cfg['QueryFrameJS']) { - top.frames.queryframe.querywindow.document.querywindow.db.value = ""; - top.frames.queryframe.querywindow.document.querywindow.query_history_latest_db.value = ""; - top.frames.queryframe.querywindow.document.querywindow.table.value = ""; - top.frames.queryframe.querywindow.document.querywindow.query_history_latest_table.value = ""; - - - - - top.frames.queryframe.querywindow.document.querywindow.submit(); + if (!top.frames.queryframe.querywindow.document.sqlform.LockFromUpdate.checked) { + top.frames.queryframe.querywindow.document.querywindow.db.value = ""; + top.frames.queryframe.querywindow.document.querywindow.query_history_latest_db.value = ""; + top.frames.queryframe.querywindow.document.querywindow.table.value = ""; + top.frames.queryframe.querywindow.document.querywindow.query_history_latest_table.value = ""; + + + + + top.frames.queryframe.querywindow.document.querywindow.submit(); + } diff --git a/lang/afrikaans-iso-8859-1.inc.php3 b/lang/afrikaans-iso-8859-1.inc.php3 index 7f2fa7258..e40d591e7 100644 --- a/lang/afrikaans-iso-8859-1.inc.php3 +++ b/lang/afrikaans-iso-8859-1.inc.php3 @@ -655,4 +655,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/afrikaans-utf-8.inc.php3 b/lang/afrikaans-utf-8.inc.php3 index c35479680..1d7882554 100644 --- a/lang/afrikaans-utf-8.inc.php3 +++ b/lang/afrikaans-utf-8.inc.php3 @@ -656,4 +656,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/albanian-iso-8859-1.inc.php3 b/lang/albanian-iso-8859-1.inc.php3 index e9494171b..22d1ab1ba 100644 --- a/lang/albanian-iso-8859-1.inc.php3 +++ b/lang/albanian-iso-8859-1.inc.php3 @@ -647,4 +647,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php3 b/lang/albanian-utf-8.inc.php3 index 74abc84e4..a7ecd2406 100644 --- a/lang/albanian-utf-8.inc.php3 +++ b/lang/albanian-utf-8.inc.php3 @@ -648,4 +648,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php3 b/lang/arabic-utf-8.inc.php3 index d125dadfe..ffc0a4e50 100644 --- a/lang/arabic-utf-8.inc.php3 +++ b/lang/arabic-utf-8.inc.php3 @@ -670,4 +670,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/arabic-windows-1256.inc.php3 b/lang/arabic-windows-1256.inc.php3 index 4b239304a..572a5b3e6 100644 --- a/lang/arabic-windows-1256.inc.php3 +++ b/lang/arabic-windows-1256.inc.php3 @@ -669,4 +669,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php3 b/lang/brazilian_portuguese-iso-8859-1.inc.php3 index 87e4a60c7..5e982473a 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php3 +++ b/lang/brazilian_portuguese-iso-8859-1.inc.php3 @@ -669,4 +669,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php3 b/lang/brazilian_portuguese-utf-8.inc.php3 index 3d0305b31..1a57aced7 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php3 +++ b/lang/brazilian_portuguese-utf-8.inc.php3 @@ -670,4 +670,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/bulgarian-koi8-r.inc.php3 b/lang/bulgarian-koi8-r.inc.php3 index 01a3f74a4..9cce1a7c6 100644 --- a/lang/bulgarian-koi8-r.inc.php3 +++ b/lang/bulgarian-koi8-r.inc.php3 @@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php3 b/lang/bulgarian-utf-8.inc.php3 index 84798c78f..570beb57b 100644 --- a/lang/bulgarian-utf-8.inc.php3 +++ b/lang/bulgarian-utf-8.inc.php3 @@ -650,4 +650,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/bulgarian-windows-1251.inc.php3 b/lang/bulgarian-windows-1251.inc.php3 index 36cb36ee5..a83881037 100644 --- a/lang/bulgarian-windows-1251.inc.php3 +++ b/lang/bulgarian-windows-1251.inc.php3 @@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/catalan-iso-8859-1.inc.php3 b/lang/catalan-iso-8859-1.inc.php3 index 34aafb102..ea5ee8c2b 100644 --- a/lang/catalan-iso-8859-1.inc.php3 +++ b/lang/catalan-iso-8859-1.inc.php3 @@ -643,4 +643,5 @@ $strZip = '"comprimit amb zip"'; $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php3 b/lang/catalan-utf-8.inc.php3 index a6d50cd8e..24aaa0d4b 100644 --- a/lang/catalan-utf-8.inc.php3 +++ b/lang/catalan-utf-8.inc.php3 @@ -644,4 +644,5 @@ $strZip = '"comprimit amb zip"'; $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/chinese_big5-utf-8.inc.php3 b/lang/chinese_big5-utf-8.inc.php3 index ebe9fa41d..2fb126b9b 100644 --- a/lang/chinese_big5-utf-8.inc.php3 +++ b/lang/chinese_big5-utf-8.inc.php3 @@ -669,4 +669,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index b3165fdcf..c9f9704db 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -668,4 +668,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/chinese_gb-utf-8.inc.php3 b/lang/chinese_gb-utf-8.inc.php3 index 33cc96a4f..0a1fcf26c 100644 --- a/lang/chinese_gb-utf-8.inc.php3 +++ b/lang/chinese_gb-utf-8.inc.php3 @@ -645,4 +645,5 @@ $strZip = '"zipped"'; $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index 6811972d9..6511b0860 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -645,4 +645,5 @@ $strZip = '"zipped"'; $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/croatian-iso-8859-2.inc.php3 b/lang/croatian-iso-8859-2.inc.php3 index 068350e29..635cbe781 100644 --- a/lang/croatian-iso-8859-2.inc.php3 +++ b/lang/croatian-iso-8859-2.inc.php3 @@ -668,4 +668,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php3 b/lang/croatian-utf-8.inc.php3 index 9be4da090..0e87d7544 100644 --- a/lang/croatian-utf-8.inc.php3 +++ b/lang/croatian-utf-8.inc.php3 @@ -669,4 +669,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/croatian-windows-1250.inc.php3 b/lang/croatian-windows-1250.inc.php3 index 330acb45f..d645f630c 100644 --- a/lang/croatian-windows-1250.inc.php3 +++ b/lang/croatian-windows-1250.inc.php3 @@ -668,4 +668,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/czech-iso-8859-2.inc.php3 b/lang/czech-iso-8859-2.inc.php3 index 8a82ce38d..cb65d0b96 100644 --- a/lang/czech-iso-8859-2.inc.php3 +++ b/lang/czech-iso-8859-2.inc.php3 @@ -648,4 +648,5 @@ $strZeroRemovesTheLimit = 'Pozn $strZip = '"zazipováno"'; // To translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php3 b/lang/czech-utf-8.inc.php3 index bf0ec2ba7..3b67153e6 100644 --- a/lang/czech-utf-8.inc.php3 +++ b/lang/czech-utf-8.inc.php3 @@ -649,4 +649,5 @@ $strZeroRemovesTheLimit = 'Poznámka: Nastavení tÄ›chto parametrů na 0 (nulu) $strZip = '"zazipováno"'; // To translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/czech-windows-1250.inc.php3 b/lang/czech-windows-1250.inc.php3 index e11fec12e..78b4738f9 100644 --- a/lang/czech-windows-1250.inc.php3 +++ b/lang/czech-windows-1250.inc.php3 @@ -648,4 +648,5 @@ $strZeroRemovesTheLimit = 'Pozn $strZip = '"zazipováno"'; // To translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/danish-iso-8859-1.inc.php3 b/lang/danish-iso-8859-1.inc.php3 index d9ce3b932..c0d9c2555 100644 --- a/lang/danish-iso-8859-1.inc.php3 +++ b/lang/danish-iso-8859-1.inc.php3 @@ -663,4 +663,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php3 b/lang/danish-utf-8.inc.php3 index c7c502b92..d53e4ff8b 100644 --- a/lang/danish-utf-8.inc.php3 +++ b/lang/danish-utf-8.inc.php3 @@ -664,4 +664,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/dutch-iso-8859-1.inc.php3 b/lang/dutch-iso-8859-1.inc.php3 index a9c36ad93..26337e63f 100644 --- a/lang/dutch-iso-8859-1.inc.php3 +++ b/lang/dutch-iso-8859-1.inc.php3 @@ -658,4 +658,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php3 b/lang/dutch-utf-8.inc.php3 index aaf8807ab..72fdfada7 100644 --- a/lang/dutch-utf-8.inc.php3 +++ b/lang/dutch-utf-8.inc.php3 @@ -659,4 +659,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3 index bd79a8c7e..e8316036e 100644 --- a/lang/english-iso-8859-1.inc.php3 +++ b/lang/english-iso-8859-1.inc.php3 @@ -641,4 +641,5 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3 index 015d3b0f2..0263d6d4f 100644 --- a/lang/english-utf-8.inc.php3 +++ b/lang/english-utf-8.inc.php3 @@ -642,4 +642,5 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/estonian-iso-8859-1.inc.php3 b/lang/estonian-iso-8859-1.inc.php3 index d8c65eb49..d40d12451 100644 --- a/lang/estonian-iso-8859-1.inc.php3 +++ b/lang/estonian-iso-8859-1.inc.php3 @@ -642,4 +642,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php3 b/lang/estonian-utf-8.inc.php3 index 23fd462f5..9793a3251 100644 --- a/lang/estonian-utf-8.inc.php3 +++ b/lang/estonian-utf-8.inc.php3 @@ -643,4 +643,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php3 b/lang/finnish-iso-8859-1.inc.php3 index aada0f1f2..1bd3c3b56 100644 --- a/lang/finnish-iso-8859-1.inc.php3 +++ b/lang/finnish-iso-8859-1.inc.php3 @@ -665,4 +665,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php3 b/lang/finnish-utf-8.inc.php3 index ad93bf4c4..25a6c49df 100644 --- a/lang/finnish-utf-8.inc.php3 +++ b/lang/finnish-utf-8.inc.php3 @@ -666,4 +666,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/french-iso-8859-1.inc.php3 b/lang/french-iso-8859-1.inc.php3 index 190259161..886f179cc 100644 --- a/lang/french-iso-8859-1.inc.php3 +++ b/lang/french-iso-8859-1.inc.php3 @@ -643,4 +643,5 @@ $strZip = '"zipp $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/french-utf-8.inc.php3 b/lang/french-utf-8.inc.php3 index cd0d1f45b..fb287a8ca 100644 --- a/lang/french-utf-8.inc.php3 +++ b/lang/french-utf-8.inc.php3 @@ -644,4 +644,5 @@ $strZip = '"zippé"'; $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/galician-iso-8859-1.inc.php3 b/lang/galician-iso-8859-1.inc.php3 index 1781b0003..b46067082 100644 --- a/lang/galician-iso-8859-1.inc.php3 +++ b/lang/galician-iso-8859-1.inc.php3 @@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php3 b/lang/galician-utf-8.inc.php3 index 67e609b14..d845c5f34 100644 --- a/lang/galician-utf-8.inc.php3 +++ b/lang/galician-utf-8.inc.php3 @@ -650,4 +650,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php3 b/lang/georgian-utf-8.inc.php3 index 57eefcbb2..fef064f3d 100644 --- a/lang/georgian-utf-8.inc.php3 +++ b/lang/georgian-utf-8.inc.php3 @@ -668,4 +668,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php3 index 48e2a25dd..fa2c14ab5 100644 --- a/lang/german-iso-8859-1.inc.php3 +++ b/lang/german-iso-8859-1.inc.php3 @@ -649,4 +649,5 @@ $strLoadExplanation = 'Die beste Methode zur Verarbeitung der hochgeladenen Date $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php3 index 157f47f89..acca4c514 100644 --- a/lang/german-utf-8.inc.php3 +++ b/lang/german-utf-8.inc.php3 @@ -650,4 +650,5 @@ $strLoadExplanation = 'Die beste Methode zur Verarbeitung der hochgeladenen Date $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/greek-iso-8859-7.inc.php3 b/lang/greek-iso-8859-7.inc.php3 index c4165b7a1..d1367bb2a 100644 --- a/lang/greek-iso-8859-7.inc.php3 +++ b/lang/greek-iso-8859-7.inc.php3 @@ -667,4 +667,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php3 b/lang/greek-utf-8.inc.php3 index 5da5690e0..902590876 100644 --- a/lang/greek-utf-8.inc.php3 +++ b/lang/greek-utf-8.inc.php3 @@ -668,4 +668,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php3 b/lang/hebrew-iso-8859-8-i.inc.php3 index c384ef5d8..84d1c004a 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php3 +++ b/lang/hebrew-iso-8859-8-i.inc.php3 @@ -665,4 +665,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php3 b/lang/hindi-utf-8.inc.php3 index 12f01bdf4..465bb9e09 100644 --- a/lang/hindi-utf-8.inc.php3 +++ b/lang/hindi-utf-8.inc.php3 @@ -679,4 +679,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/hungarian-iso-8859-2.inc.php3 b/lang/hungarian-iso-8859-2.inc.php3 index be93f5363..e1ce8585d 100644 --- a/lang/hungarian-iso-8859-2.inc.php3 +++ b/lang/hungarian-iso-8859-2.inc.php3 @@ -653,4 +653,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php3 b/lang/hungarian-utf-8.inc.php3 index 682647a75..ff0e6ecdf 100644 --- a/lang/hungarian-utf-8.inc.php3 +++ b/lang/hungarian-utf-8.inc.php3 @@ -654,4 +654,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/indonesian-iso-8859-1.inc.php3 b/lang/indonesian-iso-8859-1.inc.php3 index 8ec6ea387..26fd2e9bb 100644 --- a/lang/indonesian-iso-8859-1.inc.php3 +++ b/lang/indonesian-iso-8859-1.inc.php3 @@ -642,4 +642,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php3 b/lang/indonesian-utf-8.inc.php3 index 5a4a1b8d4..bda682807 100644 --- a/lang/indonesian-utf-8.inc.php3 +++ b/lang/indonesian-utf-8.inc.php3 @@ -643,4 +643,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/italian-iso-8859-1.inc.php3 b/lang/italian-iso-8859-1.inc.php3 index 897028caf..88531cba1 100644 --- a/lang/italian-iso-8859-1.inc.php3 +++ b/lang/italian-iso-8859-1.inc.php3 @@ -647,4 +647,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php3 b/lang/italian-utf-8.inc.php3 index c9e52fb52..3daad2b01 100644 --- a/lang/italian-utf-8.inc.php3 +++ b/lang/italian-utf-8.inc.php3 @@ -648,4 +648,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index d99180ca3..4dcfb159e 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -653,4 +653,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index e6f7f0426..9afcbd59f 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -653,4 +653,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php3 b/lang/japanese-utf-8.inc.php3 index 2d8e4615d..41dde7040 100644 --- a/lang/japanese-utf-8.inc.php3 +++ b/lang/japanese-utf-8.inc.php3 @@ -654,4 +654,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/korean-ks_c_5601-1987.inc.php3 b/lang/korean-ks_c_5601-1987.inc.php3 index deb6ac87a..675651a02 100644 --- a/lang/korean-ks_c_5601-1987.inc.php3 +++ b/lang/korean-ks_c_5601-1987.inc.php3 @@ -663,4 +663,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php3 b/lang/latvian-utf-8.inc.php3 index 532ee0865..cbef39d57 100644 --- a/lang/latvian-utf-8.inc.php3 +++ b/lang/latvian-utf-8.inc.php3 @@ -647,4 +647,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/latvian-windows-1257.inc.php3 b/lang/latvian-windows-1257.inc.php3 index c44edddee..4eeddfd59 100644 --- a/lang/latvian-windows-1257.inc.php3 +++ b/lang/latvian-windows-1257.inc.php3 @@ -646,4 +646,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php3 b/lang/lithuanian-utf-8.inc.php3 index acb9f257a..ffc411372 100644 --- a/lang/lithuanian-utf-8.inc.php3 +++ b/lang/lithuanian-utf-8.inc.php3 @@ -644,4 +644,5 @@ $strLoadMethod = 'LOAD method'; //to translate $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/lithuanian-windows-1257.inc.php3 b/lang/lithuanian-windows-1257.inc.php3 index 436ec74dd..ba230ed9e 100644 --- a/lang/lithuanian-windows-1257.inc.php3 +++ b/lang/lithuanian-windows-1257.inc.php3 @@ -643,4 +643,5 @@ $strLoadMethod = 'LOAD method'; //to translate $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/malay-iso-8859-1.inc.php3 b/lang/malay-iso-8859-1.inc.php3 index 6851c3592..df2cb9a16 100644 --- a/lang/malay-iso-8859-1.inc.php3 +++ b/lang/malay-iso-8859-1.inc.php3 @@ -664,4 +664,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php3 b/lang/malay-utf-8.inc.php3 index 25de01cc0..59e74b902 100644 --- a/lang/malay-utf-8.inc.php3 +++ b/lang/malay-utf-8.inc.php3 @@ -665,4 +665,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/norwegian-iso-8859-1.inc.php3 b/lang/norwegian-iso-8859-1.inc.php3 index baf3743bb..04471ece9 100644 --- a/lang/norwegian-iso-8859-1.inc.php3 +++ b/lang/norwegian-iso-8859-1.inc.php3 @@ -646,4 +646,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php3 b/lang/norwegian-utf-8.inc.php3 index 3e118df63..1d7403255 100644 --- a/lang/norwegian-utf-8.inc.php3 +++ b/lang/norwegian-utf-8.inc.php3 @@ -647,4 +647,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/polish-iso-8859-2.inc.php3 b/lang/polish-iso-8859-2.inc.php3 index 4a1683b7f..7683c539b 100644 --- a/lang/polish-iso-8859-2.inc.php3 +++ b/lang/polish-iso-8859-2.inc.php3 @@ -642,4 +642,5 @@ $strZip = '".zip"'; $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php3 b/lang/polish-utf-8.inc.php3 index 8d8b0586b..6e98611fe 100644 --- a/lang/polish-utf-8.inc.php3 +++ b/lang/polish-utf-8.inc.php3 @@ -643,4 +643,5 @@ $strZip = '".zip"'; $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/portuguese-iso-8859-1.inc.php3 b/lang/portuguese-iso-8859-1.inc.php3 index d6c3fe9ff..738d17ebd 100644 --- a/lang/portuguese-iso-8859-1.inc.php3 +++ b/lang/portuguese-iso-8859-1.inc.php3 @@ -664,4 +664,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php3 b/lang/portuguese-utf-8.inc.php3 index 39644c39d..2c08a5632 100644 --- a/lang/portuguese-utf-8.inc.php3 +++ b/lang/portuguese-utf-8.inc.php3 @@ -665,4 +665,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/romanian-iso-8859-1.inc.php3 b/lang/romanian-iso-8859-1.inc.php3 index 002fea945..8e2c900e8 100644 --- a/lang/romanian-iso-8859-1.inc.php3 +++ b/lang/romanian-iso-8859-1.inc.php3 @@ -643,4 +643,5 @@ $strZip = '"arhivat"'; $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php3 b/lang/romanian-utf-8.inc.php3 index 962814a12..7139ea1ab 100644 --- a/lang/romanian-utf-8.inc.php3 +++ b/lang/romanian-utf-8.inc.php3 @@ -644,4 +644,5 @@ $strZip = '"arhivat"'; $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/russian-dos-866.inc.php3 b/lang/russian-dos-866.inc.php3 index c9e9c2670..b1dd9ffef 100644 --- a/lang/russian-dos-866.inc.php3 +++ b/lang/russian-dos-866.inc.php3 @@ -651,4 +651,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php3 b/lang/russian-koi8-r.inc.php3 index 2947ba5bb..afc09d2a6 100644 --- a/lang/russian-koi8-r.inc.php3 +++ b/lang/russian-koi8-r.inc.php3 @@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php3 b/lang/russian-utf-8.inc.php3 index b31cb065b..27895d960 100644 --- a/lang/russian-utf-8.inc.php3 +++ b/lang/russian-utf-8.inc.php3 @@ -650,4 +650,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/russian-windows-1251.inc.php3 b/lang/russian-windows-1251.inc.php3 index 200a0c4a2..55949767d 100644 --- a/lang/russian-windows-1251.inc.php3 +++ b/lang/russian-windows-1251.inc.php3 @@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/serbian-utf-8.inc.php3 b/lang/serbian-utf-8.inc.php3 index a35a230da..17f932a2a 100644 --- a/lang/serbian-utf-8.inc.php3 +++ b/lang/serbian-utf-8.inc.php3 @@ -671,4 +671,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/serbian-windows-1250.inc.php3 b/lang/serbian-windows-1250.inc.php3 index cb0aa521c..f60eb3f4e 100644 --- a/lang/serbian-windows-1250.inc.php3 +++ b/lang/serbian-windows-1250.inc.php3 @@ -670,4 +670,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/slovak-iso-8859-2.inc.php3 b/lang/slovak-iso-8859-2.inc.php3 index fda37752b..88045db20 100644 --- a/lang/slovak-iso-8859-2.inc.php3 +++ b/lang/slovak-iso-8859-2.inc.php3 @@ -651,4 +651,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php3 b/lang/slovak-utf-8.inc.php3 index 33697d073..c5b125791 100644 --- a/lang/slovak-utf-8.inc.php3 +++ b/lang/slovak-utf-8.inc.php3 @@ -652,4 +652,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/slovak-windows-1250.inc.php3 b/lang/slovak-windows-1250.inc.php3 index ab9a5ea45..9baab64b4 100644 --- a/lang/slovak-windows-1250.inc.php3 +++ b/lang/slovak-windows-1250.inc.php3 @@ -651,4 +651,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/slovenian-iso-8859-2.inc.php3 b/lang/slovenian-iso-8859-2.inc.php3 index f0fd7b6c1..744b6bdab 100644 --- a/lang/slovenian-iso-8859-2.inc.php3 +++ b/lang/slovenian-iso-8859-2.inc.php3 @@ -648,4 +648,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php3 b/lang/slovenian-utf-8.inc.php3 index c5f72c2e5..19adb1de2 100644 --- a/lang/slovenian-utf-8.inc.php3 +++ b/lang/slovenian-utf-8.inc.php3 @@ -649,4 +649,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/slovenian-windows-1250.inc.php3 b/lang/slovenian-windows-1250.inc.php3 index 254d9893a..4745692ca 100644 --- a/lang/slovenian-windows-1250.inc.php3 +++ b/lang/slovenian-windows-1250.inc.php3 @@ -648,4 +648,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/spanish-iso-8859-1.inc.php3 b/lang/spanish-iso-8859-1.inc.php3 index bf1583369..7fbaae7c6 100644 --- a/lang/spanish-iso-8859-1.inc.php3 +++ b/lang/spanish-iso-8859-1.inc.php3 @@ -643,4 +643,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php3 b/lang/spanish-utf-8.inc.php3 index f31519ef1..ed0beac01 100644 --- a/lang/spanish-utf-8.inc.php3 +++ b/lang/spanish-utf-8.inc.php3 @@ -644,4 +644,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/swedish-iso-8859-1.inc.php3 b/lang/swedish-iso-8859-1.inc.php3 index 5a9ba850b..5e5122f7c 100644 --- a/lang/swedish-iso-8859-1.inc.php3 +++ b/lang/swedish-iso-8859-1.inc.php3 @@ -642,4 +642,5 @@ $strZip = '"zippad"'; $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php3 b/lang/swedish-utf-8.inc.php3 index 5083eafda..118879cf9 100644 --- a/lang/swedish-utf-8.inc.php3 +++ b/lang/swedish-utf-8.inc.php3 @@ -643,4 +643,5 @@ $strZip = '"zippad"'; $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/thai-tis-620.inc.php3 b/lang/thai-tis-620.inc.php3 index d7cbb66e7..95dd7b5e1 100644 --- a/lang/thai-tis-620.inc.php3 +++ b/lang/thai-tis-620.inc.php3 @@ -653,4 +653,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php3 b/lang/thai-utf-8.inc.php3 index 1c6009b19..2f29b1fe3 100644 --- a/lang/thai-utf-8.inc.php3 +++ b/lang/thai-utf-8.inc.php3 @@ -654,4 +654,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php3 b/lang/turkish-iso-8859-9.inc.php3 index 4d03abda8..fd0962dec 100644 --- a/lang/turkish-iso-8859-9.inc.php3 +++ b/lang/turkish-iso-8859-9.inc.php3 @@ -664,4 +664,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php3 b/lang/turkish-utf-8.inc.php3 index 97a3ad5ac..6eb410e79 100644 --- a/lang/turkish-utf-8.inc.php3 +++ b/lang/turkish-utf-8.inc.php3 @@ -665,4 +665,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php3 b/lang/ukrainian-utf-8.inc.php3 index b10a1935d..d9f7d0eef 100644 --- a/lang/ukrainian-utf-8.inc.php3 +++ b/lang/ukrainian-utf-8.inc.php3 @@ -644,4 +644,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/lang/ukrainian-windows-1251.inc.php3 b/lang/ukrainian-windows-1251.inc.php3 index 6103bcc81..0620708a2 100644 --- a/lang/ukrainian-windows-1251.inc.php3 +++ b/lang/ukrainian-windows-1251.inc.php3 @@ -643,4 +643,5 @@ $strLoadExplanation = 'The best method is checked by default, but you can change $strExecuteBookmarked = 'Execute bookmarked query'; //to translate $strExcelOptions = 'Excel options'; //to translate $strReplaceNULLBy = 'Replace NULL by'; //to translate +$strQueryWindowLock = 'Do not overwrite this query from outside the window'; //to translate ?> diff --git a/tbl_query_box.php3 b/tbl_query_box.php3 index d89099ffa..b66ab41f0 100755 --- a/tbl_query_box.php3 +++ b/tbl_query_box.php3 @@ -45,12 +45,19 @@ else { // loic1: defines wether file upload is available or not // ($is_upload now defined in common.lib.php3) +if ($cfg['QueryFrame'] && $cfg['QueryFrameJS'] && isset($is_inside_querywindow) && $is_inside_querywindow == TRUE && isset($querydisplay_tab) && ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full')) { + $locking = 'onKeyPress="this.form.elements[\'LockFromUpdate\'].checked = true;"'; +} else { + $locking = ''; +} + $auto_sel = ($cfg['TextareaAutoSelect'] // 2003-02-05 rabus: This causes big trouble with Opera 7 for // Windows, so let's disable it there... && !(PMA_USR_OS == 'Win' && PMA_USR_BROWSER_AGENT == 'OPERA' && PMA_USR_BROWSER_VER >= 7)) ? "\n" . ' onfocus="if (typeof(document.layers) == \'undefined\' || typeof(textarea_selected) == \'undefined\') {textarea_selected = 1; this.form.elements[\'sql_query\'].select();}"' : ''; +$auto_sel .= ' ' . $locking; // garvin: If non-JS query window is embedded, display a list of databases to choose from. // Apart from that, a non-js query window sucks badly. @@ -143,6 +150,16 @@ if (isset($is_inside_querywindow) && $is_inside_querywindow == TRUE) {  
+ + +