diff --git a/ChangeLog b/ChangeLog index 21e43c4574..4d969b434a 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,13 @@ phpMyAdmin - Changelog $Id$ $Source$ +2003-11-03 Alexander M. Turek + * lang/german-*.inc.php3: Grammar. + * config.inc.php3, libraries/common.lib.php3, + libraries/config_import.lib.php3, libraries/display_export.lib.php3, + libraries/export/csv.php3, lang/*.inc.php3: + Bug #812474 (Excel v.X does not import 'CSV for Excel' exports). + 2003-11-02 Marc Delisle * lang/arabic: big update, thanks to Ossama Khayat (okhayat) * lang/norwegian: Updated, thanks to Sven-Erik Andersen (sven-erik). @@ -54,14 +61,14 @@ $Source$ * pdf_pages.php3: Patch 825672: show fields in Edit PDF scratchboard, thanks to Chris Walsh (chriswalshaz) * libraries/display_tbl.lib.php3: bug 826847, undefined $url_query - * tbl_relation.php3: Bug 827340: Relation view should display also + * tbl_relation.php3: Bug 827340: Relation view should display also non-unique keys as possible choices for foreign keys 2003-10-20 Michal Cihar * Documentation, config.inc.php3, tbl_change.php3, libraries/common.lib.php3, libraries/config_import.lib.php3: Make default functions configurable (RFE #821271). - + 2003-10-18 Marc Delisle * libraries/common.lib.php3: bug 821512, Safari 1.0 v85.5 and fonts * libraries/functions.js: bug 825665, scratchboard and paper size diff --git a/config.inc.php3 b/config.inc.php3 index 202e50b1b4..9107d9d563 100755 --- a/config.inc.php3 +++ b/config.inc.php3 @@ -311,6 +311,7 @@ $cfg['Export']['csv_escaped'] = '\\'; $cfg['Export']['csv_terminated'] = 'AUTO'; $cfg['Export']['excel_columns'] = FALSE; $cfg['Export']['excel_null'] = 'NULL'; +$cfg['Export']['excel_edition'] = 'win'; // win/mac $cfg['Export']['latex_structure'] = TRUE; $cfg['Export']['latex_data'] = TRUE; @@ -394,7 +395,7 @@ $cfg['RecodingEngine'] = 'auto'; // Specify some parameters for iconv used in charset conversion. See iconv // documentation for details: -// http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html +// http://www.gnu.org/software/libiconv/documentation/libiconv/iconv_open.3.html $cfg['IconvExtraParams'] = ''; // Available charsets for MySQL conversion. currently contains all which could @@ -653,7 +654,7 @@ if ($cfg['ShowFunctionFields']) { 'WEEKDAY', 'CONCAT' ); - + // Which column types will be mapped to which Group? $cfg['RestrictColumnTypes'] = array( 'VARCHAR' => 'FUNC_CHAR', @@ -724,7 +725,7 @@ if ($cfg['ShowFunctionFields']) { 'SUM' ) ); - + // Default functions for above defined groups $cfg['DefaultFunctions'] = array( 'FUNC_CHAR' => '', @@ -733,7 +734,7 @@ if ($cfg['ShowFunctionFields']) { 'first_timestamp' => 'NOW' ); - + } // end if diff --git a/lang/afrikaans-iso-8859-1.inc.php3 b/lang/afrikaans-iso-8859-1.inc.php3 index a400e35883..0294621fbd 100644 --- a/lang/afrikaans-iso-8859-1.inc.php3 +++ b/lang/afrikaans-iso-8859-1.inc.php3 @@ -727,4 +727,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/afrikaans-utf-8.inc.php3 b/lang/afrikaans-utf-8.inc.php3 index 712ddb1852..5e19a98793 100644 --- a/lang/afrikaans-utf-8.inc.php3 +++ b/lang/afrikaans-utf-8.inc.php3 @@ -728,4 +728,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/albanian-iso-8859-1.inc.php3 b/lang/albanian-iso-8859-1.inc.php3 index 019923a34d..9bd547ba23 100644 --- a/lang/albanian-iso-8859-1.inc.php3 +++ b/lang/albanian-iso-8859-1.inc.php3 @@ -720,4 +720,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strLatexCaption = 'Table caption'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php3 b/lang/albanian-utf-8.inc.php3 index db9f162ebc..1d8a25847e 100644 --- a/lang/albanian-utf-8.inc.php3 +++ b/lang/albanian-utf-8.inc.php3 @@ -721,4 +721,5 @@ $strCreationDates = 'Creation/Update/Check dates'; //to translate $strLatexCaption = 'Table caption'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php3 b/lang/arabic-utf-8.inc.php3 index 514a7c1885..1a8a811468 100644 --- a/lang/arabic-utf-8.inc.php3 +++ b/lang/arabic-utf-8.inc.php3 @@ -728,4 +728,5 @@ $strSortByKey = 'Sort by key'; //to translate $strUpgradeMySQL = 'You should upgrade to MySQL %s or later.'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/arabic-windows-1256.inc.php3 b/lang/arabic-windows-1256.inc.php3 index d6440bf669..4a7d127ab6 100644 --- a/lang/arabic-windows-1256.inc.php3 +++ b/lang/arabic-windows-1256.inc.php3 @@ -727,4 +727,5 @@ $strSortByKey = 'Sort by key'; //to translate $strUpgradeMySQL = 'You should upgrade to MySQL %s or later.'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/azerbaijani-iso-8859-9.inc.php3 b/lang/azerbaijani-iso-8859-9.inc.php3 index 96c6973bde..10b8fe8967 100644 --- a/lang/azerbaijani-iso-8859-9.inc.php3 +++ b/lang/azerbaijani-iso-8859-9.inc.php3 @@ -716,4 +716,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php3 b/lang/azerbaijani-utf-8.inc.php3 index bba81ff7d4..0a2ac05f1b 100644 --- a/lang/azerbaijani-utf-8.inc.php3 +++ b/lang/azerbaijani-utf-8.inc.php3 @@ -717,4 +717,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php3 b/lang/bosnian-utf-8.inc.php3 index 3b059f30fd..cca3b5c8f8 100644 --- a/lang/bosnian-utf-8.inc.php3 +++ b/lang/bosnian-utf-8.inc.php3 @@ -726,4 +726,5 @@ $strSortByKey = 'Sort by key'; //to translate $strUpgradeMySQL = 'You should upgrade to MySQL %s or later.'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/bosnian-windows-1250.inc.php3 b/lang/bosnian-windows-1250.inc.php3 index a0d8d52e67..6bbf3b9077 100644 --- a/lang/bosnian-windows-1250.inc.php3 +++ b/lang/bosnian-windows-1250.inc.php3 @@ -725,4 +725,5 @@ $strSortByKey = 'Sort by key'; //to translate $strUpgradeMySQL = 'You should upgrade to MySQL %s or later.'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php3 b/lang/brazilian_portuguese-iso-8859-1.inc.php3 index 065aba609e..19e5503f65 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php3 +++ b/lang/brazilian_portuguese-iso-8859-1.inc.php3 @@ -741,4 +741,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php3 b/lang/brazilian_portuguese-utf-8.inc.php3 index 2c16e40d38..9b03380642 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php3 +++ b/lang/brazilian_portuguese-utf-8.inc.php3 @@ -742,4 +742,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/bulgarian-koi8-r.inc.php3 b/lang/bulgarian-koi8-r.inc.php3 index e580651fa9..2e58e01e5d 100644 --- a/lang/bulgarian-koi8-r.inc.php3 +++ b/lang/bulgarian-koi8-r.inc.php3 @@ -722,4 +722,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php3 b/lang/bulgarian-utf-8.inc.php3 index da4d1fad0f..0d05efda1d 100644 --- a/lang/bulgarian-utf-8.inc.php3 +++ b/lang/bulgarian-utf-8.inc.php3 @@ -723,4 +723,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/bulgarian-windows-1251.inc.php3 b/lang/bulgarian-windows-1251.inc.php3 index 2decbd3ebd..39524cd1ba 100644 --- a/lang/bulgarian-windows-1251.inc.php3 +++ b/lang/bulgarian-windows-1251.inc.php3 @@ -722,4 +722,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/catalan-iso-8859-1.inc.php3 b/lang/catalan-iso-8859-1.inc.php3 index 5ac67c50b8..c0a62a4f42 100644 --- a/lang/catalan-iso-8859-1.inc.php3 +++ b/lang/catalan-iso-8859-1.inc.php3 @@ -713,4 +713,5 @@ $strZip = '"comprimit amb zip"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php3 b/lang/catalan-utf-8.inc.php3 index 3cc746fbc2..6bca7425c4 100644 --- a/lang/catalan-utf-8.inc.php3 +++ b/lang/catalan-utf-8.inc.php3 @@ -714,4 +714,5 @@ $strZip = '"comprimit amb zip"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/chinese_big5-utf-8.inc.php3 b/lang/chinese_big5-utf-8.inc.php3 index 9da2ec8831..8b9f6cc3b1 100644 --- a/lang/chinese_big5-utf-8.inc.php3 +++ b/lang/chinese_big5-utf-8.inc.php3 @@ -725,4 +725,5 @@ $strConstraintsForTable = '資料表限制'; $strBookmarkOptions = '書籤選項'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index fb92997058..283d46becf 100644 --- a/lang/chinese_big5.inc.php3 +++ b/lang/chinese_big5.inc.php3 @@ -724,4 +724,5 @@ $strConstraintsForTable = ' $strBookmarkOptions = 'ҿﶵ'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/chinese_gb-utf-8.inc.php3 b/lang/chinese_gb-utf-8.inc.php3 index 889a0610f2..ee1b53d0bc 100644 --- a/lang/chinese_gb-utf-8.inc.php3 +++ b/lang/chinese_gb-utf-8.inc.php3 @@ -719,4 +719,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index beda84ef6d..1d59eeabd0 100644 --- a/lang/chinese_gb.inc.php3 +++ b/lang/chinese_gb.inc.php3 @@ -718,4 +718,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/croatian-iso-8859-2.inc.php3 b/lang/croatian-iso-8859-2.inc.php3 index 08e0eee9c3..0544373574 100644 --- a/lang/croatian-iso-8859-2.inc.php3 +++ b/lang/croatian-iso-8859-2.inc.php3 @@ -740,4 +740,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php3 b/lang/croatian-utf-8.inc.php3 index 109a9d81b0..ebfc8c4c56 100644 --- a/lang/croatian-utf-8.inc.php3 +++ b/lang/croatian-utf-8.inc.php3 @@ -741,4 +741,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/croatian-windows-1250.inc.php3 b/lang/croatian-windows-1250.inc.php3 index c10c6c6ac0..acf8da0239 100644 --- a/lang/croatian-windows-1250.inc.php3 +++ b/lang/croatian-windows-1250.inc.php3 @@ -740,4 +740,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/czech-iso-8859-2.inc.php3 b/lang/czech-iso-8859-2.inc.php3 index d5bebcc2a2..b97102b81c 100644 --- a/lang/czech-iso-8859-2.inc.php3 +++ b/lang/czech-iso-8859-2.inc.php3 @@ -719,4 +719,5 @@ $strZeroRemovesTheLimit = 'Pozn $strZip = '"zazipovno"'; // To translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php3 b/lang/czech-utf-8.inc.php3 index abf8f1bdc1..24b3e887ca 100644 --- a/lang/czech-utf-8.inc.php3 +++ b/lang/czech-utf-8.inc.php3 @@ -720,4 +720,5 @@ $strZeroRemovesTheLimit = 'Poznámka: Nastavení těchto parametrů na 0 (nulu) $strZip = '"zazipováno"'; // To translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/czech-windows-1250.inc.php3 b/lang/czech-windows-1250.inc.php3 index eea0e2aa79..2aeb4e5907 100644 --- a/lang/czech-windows-1250.inc.php3 +++ b/lang/czech-windows-1250.inc.php3 @@ -719,4 +719,5 @@ $strZeroRemovesTheLimit = 'Pozn $strZip = '"zazipovno"'; // To translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/danish-iso-8859-1.inc.php3 b/lang/danish-iso-8859-1.inc.php3 index b167dc6612..bd08872133 100644 --- a/lang/danish-iso-8859-1.inc.php3 +++ b/lang/danish-iso-8859-1.inc.php3 @@ -735,4 +735,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php3 b/lang/danish-utf-8.inc.php3 index 057860e101..4c9c1a0361 100644 --- a/lang/danish-utf-8.inc.php3 +++ b/lang/danish-utf-8.inc.php3 @@ -736,4 +736,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/dutch-iso-8859-1.inc.php3 b/lang/dutch-iso-8859-1.inc.php3 index 34deadd87a..368418d9be 100644 --- a/lang/dutch-iso-8859-1.inc.php3 +++ b/lang/dutch-iso-8859-1.inc.php3 @@ -720,4 +720,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php3 b/lang/dutch-utf-8.inc.php3 index 1e1e18db4b..3b5e85b60b 100644 --- a/lang/dutch-utf-8.inc.php3 +++ b/lang/dutch-utf-8.inc.php3 @@ -721,4 +721,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3 index 15ba10f3a9..cf8261e296 100644 --- a/lang/english-iso-8859-1.inc.php3 +++ b/lang/english-iso-8859-1.inc.php3 @@ -712,4 +712,5 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3 index 44996b20d8..c88d9690d5 100644 --- a/lang/english-utf-8.inc.php3 +++ b/lang/english-utf-8.inc.php3 @@ -713,4 +713,5 @@ $strYes = 'Yes'; $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; $strZip = '"zipped"'; +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/estonian-iso-8859-1.inc.php3 b/lang/estonian-iso-8859-1.inc.php3 index 3ccacfd062..ee6a1606ff 100644 --- a/lang/estonian-iso-8859-1.inc.php3 +++ b/lang/estonian-iso-8859-1.inc.php3 @@ -713,4 +713,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php3 b/lang/estonian-utf-8.inc.php3 index 907b68861f..d26ddce574 100644 --- a/lang/estonian-utf-8.inc.php3 +++ b/lang/estonian-utf-8.inc.php3 @@ -714,4 +714,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php3 b/lang/finnish-iso-8859-1.inc.php3 index 0ff8f3d25b..ad9fd0d535 100644 --- a/lang/finnish-iso-8859-1.inc.php3 +++ b/lang/finnish-iso-8859-1.inc.php3 @@ -737,4 +737,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php3 b/lang/finnish-utf-8.inc.php3 index de756387ee..2295467af0 100644 --- a/lang/finnish-utf-8.inc.php3 +++ b/lang/finnish-utf-8.inc.php3 @@ -738,4 +738,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/french-iso-8859-1.inc.php3 b/lang/french-iso-8859-1.inc.php3 index 3f9dcd8c0b..985b6e7c4b 100644 --- a/lang/french-iso-8859-1.inc.php3 +++ b/lang/french-iso-8859-1.inc.php3 @@ -714,4 +714,5 @@ $strZip = '"zipp $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/french-utf-8.inc.php3 b/lang/french-utf-8.inc.php3 index f3c37a0c1c..8035ac0f3b 100644 --- a/lang/french-utf-8.inc.php3 +++ b/lang/french-utf-8.inc.php3 @@ -715,4 +715,5 @@ $strZip = '"zippé"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/galician-iso-8859-1.inc.php3 b/lang/galician-iso-8859-1.inc.php3 index fc921b5158..e8c8e41a64 100644 --- a/lang/galician-iso-8859-1.inc.php3 +++ b/lang/galician-iso-8859-1.inc.php3 @@ -719,4 +719,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php3 b/lang/galician-utf-8.inc.php3 index 74c816a77d..724c8f9fff 100644 --- a/lang/galician-utf-8.inc.php3 +++ b/lang/galician-utf-8.inc.php3 @@ -720,4 +720,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php3 b/lang/georgian-utf-8.inc.php3 index 102037e7c5..471a8ab46a 100644 --- a/lang/georgian-utf-8.inc.php3 +++ b/lang/georgian-utf-8.inc.php3 @@ -741,4 +741,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php3 index 14fb7da991..ca7d700241 100644 --- a/lang/german-iso-8859-1.inc.php3 +++ b/lang/german-iso-8859-1.inc.php3 @@ -224,6 +224,7 @@ $strEnglish = 'Englisch'; $strEnglishPrivileges = ' Anmerkung: MySQL-Rechte werden auf Englisch angegeben. '; $strError = 'Fehler'; $strEstonian = 'Estnisch'; +$strExcelEdition = 'Excel-Ausgabe'; $strExcelOptions = 'Excel-Optionen'; $strExecuteBookmarked = 'Gespeicherte SQL-Anfrage ausfhren'; $strExplain = 'SQL erklren'; @@ -503,7 +504,7 @@ $strRenameTable = 'Tabelle umbenennen in'; $strRenameTableOK = 'Tabelle %s wurde umbenannt in %s.'; $strRepairTable = 'Repariere Tabelle'; $strReplace = 'Ersetzen'; -$strReplaceNULLBy = 'Ersetze NULL mit'; +$strReplaceNULLBy = 'Ersetze NULL durch'; $strReplaceTable = 'Tabelleninhalt ersetzen'; $strReset = 'Zurcksetzen'; $strResourceLimits = 'Ressourcenbeschrnkungen'; diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php3 index 2d5bfd2bf2..805697ebbd 100644 --- a/lang/german-utf-8.inc.php3 +++ b/lang/german-utf-8.inc.php3 @@ -225,6 +225,7 @@ $strEnglish = 'Englisch'; $strEnglishPrivileges = ' Anmerkung: MySQL-Rechte werden auf Englisch angegeben. '; $strError = 'Fehler'; $strEstonian = 'Estnisch'; +$strExcelEdition = 'Excel-Ausgabe'; $strExcelOptions = 'Excel-Optionen'; $strExecuteBookmarked = 'Gespeicherte SQL-Anfrage ausführen'; $strExplain = 'SQL erklären'; @@ -504,7 +505,7 @@ $strRenameTable = 'Tabelle umbenennen in'; $strRenameTableOK = 'Tabelle %s wurde umbenannt in %s.'; $strRepairTable = 'Repariere Tabelle'; $strReplace = 'Ersetzen'; -$strReplaceNULLBy = 'Ersetze NULL mit'; +$strReplaceNULLBy = 'Ersetze NULL durch'; $strReplaceTable = 'Tabelleninhalt ersetzen'; $strReset = 'Zurücksetzen'; $strResourceLimits = 'Ressourcenbeschränkungen'; diff --git a/lang/greek-iso-8859-7.inc.php3 b/lang/greek-iso-8859-7.inc.php3 index 3d53718575..53b60be489 100644 --- a/lang/greek-iso-8859-7.inc.php3 +++ b/lang/greek-iso-8859-7.inc.php3 @@ -721,4 +721,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php3 b/lang/greek-utf-8.inc.php3 index 415de8a19f..2674e5f7aa 100644 --- a/lang/greek-utf-8.inc.php3 +++ b/lang/greek-utf-8.inc.php3 @@ -722,4 +722,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php3 b/lang/hebrew-iso-8859-8-i.inc.php3 index 60b10a938c..90932c9601 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php3 +++ b/lang/hebrew-iso-8859-8-i.inc.php3 @@ -737,4 +737,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php3 b/lang/hindi-utf-8.inc.php3 index 8b858242be..691a2b7a41 100644 --- a/lang/hindi-utf-8.inc.php3 +++ b/lang/hindi-utf-8.inc.php3 @@ -751,4 +751,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/hungarian-iso-8859-2.inc.php3 b/lang/hungarian-iso-8859-2.inc.php3 index 346a76ba74..0baedbc5bd 100644 --- a/lang/hungarian-iso-8859-2.inc.php3 +++ b/lang/hungarian-iso-8859-2.inc.php3 @@ -725,4 +725,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php3 b/lang/hungarian-utf-8.inc.php3 index 807053efb0..93eef37cae 100644 --- a/lang/hungarian-utf-8.inc.php3 +++ b/lang/hungarian-utf-8.inc.php3 @@ -726,4 +726,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/indonesian-iso-8859-1.inc.php3 b/lang/indonesian-iso-8859-1.inc.php3 index 473bef2a72..8513e5eff5 100644 --- a/lang/indonesian-iso-8859-1.inc.php3 +++ b/lang/indonesian-iso-8859-1.inc.php3 @@ -713,4 +713,5 @@ $strZip = '"Dikompress dengan Zip"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php3 b/lang/indonesian-utf-8.inc.php3 index b484378605..af1cbd27ab 100644 --- a/lang/indonesian-utf-8.inc.php3 +++ b/lang/indonesian-utf-8.inc.php3 @@ -714,4 +714,5 @@ $strZip = '"Dikompress dengan Zip"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/italian-iso-8859-1.inc.php3 b/lang/italian-iso-8859-1.inc.php3 index 42f2a1d80e..af8013fbde 100644 --- a/lang/italian-iso-8859-1.inc.php3 +++ b/lang/italian-iso-8859-1.inc.php3 @@ -718,4 +718,5 @@ $strZip = '"compresso con zip"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php3 b/lang/italian-utf-8.inc.php3 index fc78ebc3ef..d081845291 100644 --- a/lang/italian-utf-8.inc.php3 +++ b/lang/italian-utf-8.inc.php3 @@ -719,4 +719,5 @@ $strZip = '"compresso con zip"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index 0e632b3444..3d29f0dfb5 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -725,4 +725,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index 758468265b..ef8f700e2e 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -725,4 +725,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php3 b/lang/japanese-utf-8.inc.php3 index 1920f0fd61..84fc5f39db 100644 --- a/lang/japanese-utf-8.inc.php3 +++ b/lang/japanese-utf-8.inc.php3 @@ -726,4 +726,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/korean-ks_c_5601-1987.inc.php3 b/lang/korean-ks_c_5601-1987.inc.php3 index ea7622b5ee..d91164883a 100644 --- a/lang/korean-ks_c_5601-1987.inc.php3 +++ b/lang/korean-ks_c_5601-1987.inc.php3 @@ -735,4 +735,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php3 b/lang/latvian-utf-8.inc.php3 index bdc10b1a2c..3d9f1f2f4b 100644 --- a/lang/latvian-utf-8.inc.php3 +++ b/lang/latvian-utf-8.inc.php3 @@ -719,4 +719,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/latvian-windows-1257.inc.php3 b/lang/latvian-windows-1257.inc.php3 index 2959df9978..67ebe5fd65 100644 --- a/lang/latvian-windows-1257.inc.php3 +++ b/lang/latvian-windows-1257.inc.php3 @@ -718,4 +718,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php3 b/lang/lithuanian-utf-8.inc.php3 index 503406fd01..ca1006779b 100644 --- a/lang/lithuanian-utf-8.inc.php3 +++ b/lang/lithuanian-utf-8.inc.php3 @@ -715,4 +715,5 @@ $strConstraintsForTable = 'Apribojimai lentelei'; $strBookmarkOptions = 'Žymių parinktys'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/lithuanian-windows-1257.inc.php3 b/lang/lithuanian-windows-1257.inc.php3 index 5d92fdb900..5f6895fb87 100644 --- a/lang/lithuanian-windows-1257.inc.php3 +++ b/lang/lithuanian-windows-1257.inc.php3 @@ -714,4 +714,5 @@ $strConstraintsForTable = 'Apribojimai lentelei'; $strBookmarkOptions = 'ymi parinktys'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/malay-iso-8859-1.inc.php3 b/lang/malay-iso-8859-1.inc.php3 index 4e423f3332..b35d7e4564 100644 --- a/lang/malay-iso-8859-1.inc.php3 +++ b/lang/malay-iso-8859-1.inc.php3 @@ -738,4 +738,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php3 b/lang/malay-utf-8.inc.php3 index ecb55bf6b4..f5b208bc89 100644 --- a/lang/malay-utf-8.inc.php3 +++ b/lang/malay-utf-8.inc.php3 @@ -739,4 +739,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/norwegian-iso-8859-1.inc.php3 b/lang/norwegian-iso-8859-1.inc.php3 index 67b1271551..49eaef9704 100644 --- a/lang/norwegian-iso-8859-1.inc.php3 +++ b/lang/norwegian-iso-8859-1.inc.php3 @@ -718,4 +718,5 @@ $strZip = 'Komprimert (zip)'; // To translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php3 b/lang/norwegian-utf-8.inc.php3 index d9b815dbfb..141b2e1198 100644 --- a/lang/norwegian-utf-8.inc.php3 +++ b/lang/norwegian-utf-8.inc.php3 @@ -719,4 +719,5 @@ $strZip = 'Komprimert (zip)'; // To translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php3 b/lang/persian-utf-8.inc.php3 index 96eaa18932..de871b38e5 100644 --- a/lang/persian-utf-8.inc.php3 +++ b/lang/persian-utf-8.inc.php3 @@ -743,4 +743,5 @@ $strXML = 'XML'; //to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/persian-windows-1256.inc.php3 b/lang/persian-windows-1256.inc.php3 index 0705870277..88ba5bfe06 100644 --- a/lang/persian-windows-1256.inc.php3 +++ b/lang/persian-windows-1256.inc.php3 @@ -742,4 +742,5 @@ $strXML = 'XML'; //to translate $strZeroRemovesTheLimit = 'Note: Setting these options to 0 (zero) removes the limit.'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/polish-iso-8859-2.inc.php3 b/lang/polish-iso-8859-2.inc.php3 index cf3c136fdb..e0b3228987 100644 --- a/lang/polish-iso-8859-2.inc.php3 +++ b/lang/polish-iso-8859-2.inc.php3 @@ -713,4 +713,5 @@ $strZip = '".zip"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php3 b/lang/polish-utf-8.inc.php3 index 4481dbf3a6..cf17ed67f9 100644 --- a/lang/polish-utf-8.inc.php3 +++ b/lang/polish-utf-8.inc.php3 @@ -714,4 +714,5 @@ $strZip = '".zip"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/portuguese-iso-8859-1.inc.php3 b/lang/portuguese-iso-8859-1.inc.php3 index 3bf6908cf0..386ef764ca 100644 --- a/lang/portuguese-iso-8859-1.inc.php3 +++ b/lang/portuguese-iso-8859-1.inc.php3 @@ -736,4 +736,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php3 b/lang/portuguese-utf-8.inc.php3 index 3ead074499..076fc41fbe 100644 --- a/lang/portuguese-utf-8.inc.php3 +++ b/lang/portuguese-utf-8.inc.php3 @@ -737,4 +737,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/romanian-iso-8859-1.inc.php3 b/lang/romanian-iso-8859-1.inc.php3 index 5f68ba2f32..353c81bd74 100644 --- a/lang/romanian-iso-8859-1.inc.php3 +++ b/lang/romanian-iso-8859-1.inc.php3 @@ -714,4 +714,5 @@ $strZeroRemovesTheLimit = 'Observatie: Prin setarea acestor optiuni la 0 (zero) $strZip = '"arhivat"'; // To translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php3 b/lang/romanian-utf-8.inc.php3 index 6c7e60c676..914e8e391c 100644 --- a/lang/romanian-utf-8.inc.php3 +++ b/lang/romanian-utf-8.inc.php3 @@ -715,4 +715,5 @@ $strZeroRemovesTheLimit = 'Observatie: Prin setarea acestor optiuni la 0 (zero) $strZip = '"arhivat"'; // To translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/russian-dos-866.inc.php3 b/lang/russian-dos-866.inc.php3 index 516261a23b..2b278e838a 100644 --- a/lang/russian-dos-866.inc.php3 +++ b/lang/russian-dos-866.inc.php3 @@ -720,4 +720,5 @@ $strZip = ' $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php3 b/lang/russian-koi8-r.inc.php3 index a74d3cf433..a426a6d68b 100644 --- a/lang/russian-koi8-r.inc.php3 +++ b/lang/russian-koi8-r.inc.php3 @@ -720,4 +720,5 @@ $strZip = ' $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php3 b/lang/russian-utf-8.inc.php3 index 5068f7ebe0..09353e601f 100644 --- a/lang/russian-utf-8.inc.php3 +++ b/lang/russian-utf-8.inc.php3 @@ -721,4 +721,5 @@ $strZip = 'архивировать в zip'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/russian-windows-1251.inc.php3 b/lang/russian-windows-1251.inc.php3 index b5cf5950b8..ce4dcda61e 100644 --- a/lang/russian-windows-1251.inc.php3 +++ b/lang/russian-windows-1251.inc.php3 @@ -720,4 +720,5 @@ $strZip = ' $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php3 b/lang/serbian_cyrillic-utf-8.inc.php3 index cbd5146a5f..2d9ea702a0 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php3 +++ b/lang/serbian_cyrillic-utf-8.inc.php3 @@ -720,4 +720,5 @@ $strZip = '" $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/serbian_cyrillic-windows-1251.inc.php3 b/lang/serbian_cyrillic-windows-1251.inc.php3 index b3daa36c40..944145f50d 100644 --- a/lang/serbian_cyrillic-windows-1251.inc.php3 +++ b/lang/serbian_cyrillic-windows-1251.inc.php3 @@ -719,4 +719,5 @@ $strZip = '" $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php3 b/lang/serbian_latin-utf-8.inc.php3 index 71d59ed4f0..e746f8718c 100644 --- a/lang/serbian_latin-utf-8.inc.php3 +++ b/lang/serbian_latin-utf-8.inc.php3 @@ -720,4 +720,5 @@ $strZip = '"zipovano"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/serbian_latin-windows-1250.inc.php3 b/lang/serbian_latin-windows-1250.inc.php3 index b65d4c4802..73ad581570 100644 --- a/lang/serbian_latin-windows-1250.inc.php3 +++ b/lang/serbian_latin-windows-1250.inc.php3 @@ -719,4 +719,5 @@ $strZip = '"zipovano"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/slovak-iso-8859-2.inc.php3 b/lang/slovak-iso-8859-2.inc.php3 index 43a01334ab..cd8ec16f82 100644 --- a/lang/slovak-iso-8859-2.inc.php3 +++ b/lang/slovak-iso-8859-2.inc.php3 @@ -714,4 +714,5 @@ $strZip = '"zo zipovan $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php3 b/lang/slovak-utf-8.inc.php3 index 7e93eac154..5754f3ac25 100644 --- a/lang/slovak-utf-8.inc.php3 +++ b/lang/slovak-utf-8.inc.php3 @@ -715,4 +715,5 @@ $strZip = '"zo zipované"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/slovak-windows-1250.inc.php3 b/lang/slovak-windows-1250.inc.php3 index 880a1ed568..5cbd9e57e3 100644 --- a/lang/slovak-windows-1250.inc.php3 +++ b/lang/slovak-windows-1250.inc.php3 @@ -714,4 +714,5 @@ $strZip = '"zo zipovan $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/slovenian-iso-8859-2.inc.php3 b/lang/slovenian-iso-8859-2.inc.php3 index 15deb36550..c4722515eb 100644 --- a/lang/slovenian-iso-8859-2.inc.php3 +++ b/lang/slovenian-iso-8859-2.inc.php3 @@ -715,4 +715,5 @@ $strZip = '"zipano"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php3 b/lang/slovenian-utf-8.inc.php3 index 4cfbae6d31..ec7c92b91e 100644 --- a/lang/slovenian-utf-8.inc.php3 +++ b/lang/slovenian-utf-8.inc.php3 @@ -716,4 +716,5 @@ $strZip = '"zipano"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/slovenian-windows-1250.inc.php3 b/lang/slovenian-windows-1250.inc.php3 index aaf8b30bc5..fb69961703 100644 --- a/lang/slovenian-windows-1250.inc.php3 +++ b/lang/slovenian-windows-1250.inc.php3 @@ -715,4 +715,5 @@ $strZip = '"zipano"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/spanish-iso-8859-1.inc.php3 b/lang/spanish-iso-8859-1.inc.php3 index a2b81d0959..4cbe7d4198 100644 --- a/lang/spanish-iso-8859-1.inc.php3 +++ b/lang/spanish-iso-8859-1.inc.php3 @@ -712,4 +712,5 @@ $strZip = '"comprimido con zip"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php3 b/lang/spanish-utf-8.inc.php3 index 900555e723..2d2fa5afc6 100644 --- a/lang/spanish-utf-8.inc.php3 +++ b/lang/spanish-utf-8.inc.php3 @@ -713,4 +713,5 @@ $strZip = '"comprimido con zip"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/swedish-iso-8859-1.inc.php3 b/lang/swedish-iso-8859-1.inc.php3 index e5ff3d3b40..5cbc284d8b 100644 --- a/lang/swedish-iso-8859-1.inc.php3 +++ b/lang/swedish-iso-8859-1.inc.php3 @@ -713,4 +713,5 @@ $strZip = '"zippad"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php3 b/lang/swedish-utf-8.inc.php3 index f34c154c8f..5ccde1c674 100644 --- a/lang/swedish-utf-8.inc.php3 +++ b/lang/swedish-utf-8.inc.php3 @@ -714,4 +714,5 @@ $strZip = '"zippad"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/thai-tis-620.inc.php3 b/lang/thai-tis-620.inc.php3 index 7b466e1f2f..135b0d2c8d 100644 --- a/lang/thai-tis-620.inc.php3 +++ b/lang/thai-tis-620.inc.php3 @@ -725,4 +725,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php3 b/lang/thai-utf-8.inc.php3 index 68fc75e11c..a7865f4aaa 100644 --- a/lang/thai-utf-8.inc.php3 +++ b/lang/thai-utf-8.inc.php3 @@ -726,4 +726,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php3 b/lang/turkish-iso-8859-9.inc.php3 index 8d76e35d5e..fbfa5ced03 100644 --- a/lang/turkish-iso-8859-9.inc.php3 +++ b/lang/turkish-iso-8859-9.inc.php3 @@ -725,4 +725,5 @@ $strZip = '"ziplenmi $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php3 b/lang/turkish-utf-8.inc.php3 index 67d427e522..129d3b7311 100644 --- a/lang/turkish-utf-8.inc.php3 +++ b/lang/turkish-utf-8.inc.php3 @@ -726,4 +726,5 @@ $strZip = '"ziplenmiş"'; $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php3 b/lang/ukrainian-utf-8.inc.php3 index 65a2e54297..19057512c5 100644 --- a/lang/ukrainian-utf-8.inc.php3 +++ b/lang/ukrainian-utf-8.inc.php3 @@ -718,4 +718,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/lang/ukrainian-windows-1251.inc.php3 b/lang/ukrainian-windows-1251.inc.php3 index f00938fca9..e6cc61a900 100644 --- a/lang/ukrainian-windows-1251.inc.php3 +++ b/lang/ukrainian-windows-1251.inc.php3 @@ -717,4 +717,5 @@ $strConstraintsForTable = 'Constraints for table'; //to translate $strBookmarkOptions = 'Bookmark options'; //to translate $strCreationDates = 'Creation/Update/Check dates'; //to translate $strCheckOverhead = 'Check overheaded'; //to translate +$strExcelEdition = 'Excel edition'; //to translate ?> diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index 664044dd2d..08f556b766 100644 --- a/libraries/common.lib.php3 +++ b/libraries/common.lib.php3 @@ -135,7 +135,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} * Includes compatibility code for older config.inc.php3 revisions * if necessary */ - if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 207) { + if (!isset($cfg['FileRevision']) || (int) substr($cfg['FileRevision'], 13, 3) < 208) { include('./libraries/config_import.lib.php3'); } @@ -698,7 +698,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} } else { // The URI is specified, however users do often specify this // wrongly, so we try to fix this. - + // Adds a trailing slash et the end of the phpMyAdmin uri if it // does not exist. if (substr($cfg['PmaAbsoluteUri'], -1) != '/') { @@ -1983,7 +1983,7 @@ h1 {font-family: sans-serif; font-size: large; font-weight: bold} return (ereg_replace('/+', '/', $tmp_file) == $filename); } // end of the 'is_uploaded_file()' emulated function } // end if - + /** * Function to check valid extension of file. It accepts entered * extensions and bz2 and gz if supported. diff --git a/libraries/config_import.lib.php3 b/libraries/config_import.lib.php3 index 994f96ab43..b2edfa23f9 100644 --- a/libraries/config_import.lib.php3 +++ b/libraries/config_import.lib.php3 @@ -309,7 +309,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { if (!isset($cfg['LightTabs'])) { $cfg['LightTabs'] = FALSE; } - + if (!isset($cfg['PropertiesIconic'])) { $cfg['PropertiesIconic'] = TRUE; } @@ -317,7 +317,7 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { if (!isset($cfg['PropertiesNumColumns'])) { $cfg['PropertiesNumColumns'] = 1; } - + if (!isset($cfg['ShowTooltip'])) { if (isset($cfgShowTooltip)) { $cfg['ShowTooltip'] = $cfgShowTooltip; @@ -816,11 +816,11 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { if (!isset($cfg['UploadDir'])) { $cfg['UploadDir'] = ''; } - + if (!isset($cfg['SaveDir'])) { $cfg['SaveDir'] = ''; } - + if (!isset($cfg['docSQLDir'])) { $cfg['docSQLDir'] = ''; } @@ -1172,6 +1172,9 @@ if (!defined('PMA_CONFIG_IMPORT_LIB_INCLUDED')) { if (!isset($cfg['Export']['excel_columns'])) { $cfg['Export']['excel_columns'] = FALSE; } + if (!isset($cfg['Export']['excel_edition'])) { + $cfg['Export']['excel_edition'] = 'win'; + } if (!isset($cfg['Export']['latex_null'])) { $cfg['Export']['latex_null'] = '\textit{NULL}'; } diff --git a/libraries/display_export.lib.php3 b/libraries/display_export.lib.php3 index 62fd82b1e9..1818fc7847 100644 --- a/libraries/display_export.lib.php3 +++ b/libraries/display_export.lib.php3 @@ -173,7 +173,7 @@ if (PMA_MYSQL_INT_VERSION >= 32306) { ?>
-= 32321) { ?> /> @@ -393,9 +393,26 @@ if ($cfgRelation['mimework']) { + + + /> + + + + + + + + + + + - /> -
diff --git a/libraries/export/csv.php3 b/libraries/export/csv.php3 index e44a7bd854..683e2cfdcc 100644 --- a/libraries/export/csv.php3 +++ b/libraries/export/csv.php3 @@ -34,7 +34,7 @@ function PMA_exportHeader() { // Here we just prepare some values for export if ($what == 'excel') { $add_character = "\015\012"; - $separator = ','; + $separator = isset($GLOBALS['excel_edition']) && $GLOBALS['excel_edition'] == 'mac' ? ';' : ','; $enclosed = '"'; $escaped = '"'; if (isset($GLOBALS['showexcelnames']) && $GLOBALS['showexcelnames'] == 'yes') {