The branch, master has been updated via aa4536371980e7c8144505f1a74cff658178fc8c (commit) via 0d1b51576967ecbd1f771e1387e2ba1bd29fb799 (commit) via 617b01499c5aee7f212207b0ca928875df22b175 (commit) from d304002fc0bf75efe1f714d5a5cca91287528cd3 (commit)

- Log ----------------------------------------------------------------- commit aa4536371980e7c8144505f1a74cff658178fc8c Author: Michal Čihař mcihar@novell.com Date: Mon Aug 30 14:38:37 2010 +0200

Correct count of words.

commit 0d1b51576967ecbd1f771e1387e2ba1bd29fb799 Author: Michal Čihař mcihar@novell.com Date: Mon Aug 30 14:29:00 2010 +0200

Fixed detection of ods_col_names (bug #3056017).

commit 617b01499c5aee7f212207b0ca928875df22b175 Author: Michal Čihař mcihar@novell.com Date: Mon Aug 30 14:28:06 2010 +0200

Fix typo.

-----------------------------------------------------------------------

Summary of changes: libraries/import/ods.php | 2 +- libraries/sqlparser.data.php | 2 +- po/cs.po | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/import/ods.php b/libraries/import/ods.php index 7df7edc..c0db7af 100644 --- a/libraries/import/ods.php +++ b/libraries/import/ods.php @@ -90,7 +90,7 @@ $rows = array();

/* Iterate over tables */ foreach ($sheets as $sheet) { - $col_names_in_first_row = $_REQUEST['ods_col_names']; + $col_names_in_first_row = isset($_REQUEST['ods_col_names']);

/* Iterate over rows */ foreach ($sheet as $row) { diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php index 8af6458..b0b06c2 100644 --- a/libraries/sqlparser.data.php +++ b/libraries/sqlparser.data.php @@ -698,7 +698,7 @@ $PMA_SQPdata_reserved_word = array ( * * @global integer MySQL reserved words count */ -$PMA_SQPdata_reserved_word_cnt = 291; +$PMA_SQPdata_reserved_word_cnt = 289; /** * The previous array must be sorted so that the binary search work. * Sometimes a word is not added in the correct order, so diff --git a/po/cs.po b/po/cs.po index c350a27..079553c 100644 --- a/po/cs.po +++ b/po/cs.po @@ -5384,7 +5384,7 @@ msgstr "MySQL vrátil prázdný výsledek (tj. nulový počet řádků)." #: libraries/import.lib.php:1110 msgid "" "The following structures have either been created or altered. Here you can:" -msgstr "Následující tabulkybyly vytvořeny nebo změněny. Teď můžete:" +msgstr "Následující tabulky byly vytvořeny nebo změněny. Teď můžete:"

#: libraries/import.lib.php:1111 msgid "View a structure`s contents by clicking on its name"

hooks/post-receive