From 355e36d55d39cdb3e6e300eec9a100645666f6cc Mon Sep 17 00:00:00 2001 From: Martin Lacina Date: Sun, 10 Jan 2016 22:29:27 +0100 Subject: [PATCH 1/2] Translated using Weblate (Slovak) Currently translated at 83.9% (2694 of 3210 strings) [CI skip] --- po/sk.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/sk.po b/po/sk.po index 6fb983233e5b..c9b63147264d 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.3-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-12-16 07:59+0100\n" -"PO-Revision-Date: 2016-01-10 10:10+0000\n" +"PO-Revision-Date: 2016-01-10 22:29+0000\n" "Last-Translator: Martin Lacina \n" "Language-Team: Slovak " "\n" @@ -13660,10 +13660,9 @@ msgid "Variable name was expected." msgstr "Vzor pre názov tabuľky" #: libraries/sql-parser/src/Parser.php:407 -#, fuzzy #| msgid "at beginning of table" msgid "Unexpected beginning of statement." -msgstr "na začiatku tabuľky" +msgstr "Neočakávaný začiatok výrazu." #: libraries/sql-parser/src/Parser.php:426 msgid "Unrecognized statement type." From 7d261f45fef35d9f112447b2c7345ab66f01364b Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Mon, 11 Jan 2016 17:49:17 +1100 Subject: [PATCH 2/2] Fix #11840 Index comments not working properly Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/sql-parser/src/Components/Key.php | 1 + 2 files changed, 2 insertions(+) diff --git a/ChangeLog b/ChangeLog index f50cbefdbfff..3a8eb01e855e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,6 +23,7 @@ phpMyAdmin - ChangeLog - issue #11828 Do not invoke FLUSH PRIVILEGES when server in --skip-grant-tables - issue #11804 Misleading message for configuration storage - issue #11772 Table pagination does nothing when session expired +- issue #11840 Index comments not working properly 4.5.3.1 (2015-12-25) - issue #11774 Undefined offset 2 diff --git a/libraries/sql-parser/src/Components/Key.php b/libraries/sql-parser/src/Components/Key.php index 490d0675640d..161dfc6153e4 100644 --- a/libraries/sql-parser/src/Components/Key.php +++ b/libraries/sql-parser/src/Components/Key.php @@ -37,6 +37,7 @@ class Key extends Component 'KEY_BLOCK_SIZE' => array(1, 'var'), 'USING' => array(2, 'var'), 'WITH PARSER' => array(3, 'var'), + 'COMMENT' => array(4, 'var='), ); /**