From d34086b168a5d5ab18f541f8fae2cbc93bf8cf21 Mon Sep 17 00:00:00 2001 From: Alex Smirnov Date: Mon, 25 Aug 2014 23:48:27 +0200 Subject: [PATCH 1/4] Translated using Weblate (Russian) Currently translated at 99.8% (2765 of 2768) [ci skip] --- po/ru.po | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/po/ru.po b/po/ru.po index a18140ebf4..2b40001fa1 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-08-14 10:52+0200\n" +"PO-Revision-Date: 2014-08-25 23:48+0200\n" "Last-Translator: Alex Smirnov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -6775,6 +6775,9 @@ msgid "" "configurable menus feature; leaving either one of them blank will disable " "this feature, suggested: [kbd]pma__users[/kbd]." msgstr "" +"Эта таблица и таблица групп пользователей требуются для включения " +"возможности настраиваемых меню; если хотя бы одна из них пустая, то эта " +"возможность будет отключена, предложил: [kbd]pma__users[/kbd]." #: libraries/config/messages.inc.php:710 #| msgid "Use Tables" @@ -6787,6 +6790,9 @@ msgid "" "menus feature; leaving either one of them blank will disable this feature, " "suggested: [kbd]pma__usergroups[/kbd]." msgstr "" +"Эта таблица и таблица пользователей требуются для включения возможности " +"настраиваемых меню; если хотя бы одна из них пустая, то эта возможность " +"будет отключена, предложил: [kbd]pma__usergroups[/kbd]." #: libraries/config/messages.inc.php:712 #| msgid "Use Host Table" From 83e90ae1a0507807514e73a939cbe0d4f6aebb2f Mon Sep 17 00:00:00 2001 From: Smita Kumari Date: Wed, 27 Aug 2014 18:47:21 +0530 Subject: [PATCH 2/4] bug fix #4487 Signed-off-by: Smita Kumari --- libraries/plugins/export/ExportSql.class.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/libraries/plugins/export/ExportSql.class.php b/libraries/plugins/export/ExportSql.class.php index b4622020ac..8b136e023e 100644 --- a/libraries/plugins/export/ExportSql.class.php +++ b/libraries/plugins/export/ExportSql.class.php @@ -1481,13 +1481,18 @@ class ExportSql extends ExportPlugin // that could be there starting with MySQL 5.0.24 // in Drizzle it's useless as it contains the value given at table // creation time - $schema_create = preg_replace( - '/AUTO_INCREMENT\s*=\s*([0-9])+/', - '', - $schema_create - ); - - $schema_create .= ($compat != 'MSSQL') ? $auto_increment : ''; + if (preg_match('/AUTO_INCREMENT\s*=\s*([0-9])+/', $schema_create)) { + if ($compat == 'MSSQL' || $auto_increment == '') { + $auto_increment = ' '; + } + $schema_create = preg_replace( + '/\sAUTO_INCREMENT\s*=\s*([0-9])+\s/', + $auto_increment, + $schema_create + ); + } else { + $schema_create .= ($compat != 'MSSQL') ? $auto_increment : ''; + } $GLOBALS['dbi']->freeResult($result); return $schema_create . ($add_semicolon ? ';' . $crlf : ''); From 9776abce4679e837708bf2d15f646a4c864c3a6f Mon Sep 17 00:00:00 2001 From: Chien Wei Lin Date: Tue, 26 Aug 2014 20:02:50 +0200 Subject: [PATCH 3/4] Translated using Weblate (Traditional Chinese) Currently translated at 99.8% (2765 of 2768) [ci skip] --- po/zh_TW.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/po/zh_TW.po b/po/zh_TW.po index ca8c747e77..8169662cfc 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.6-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-07-08 07:11-0400\n" -"PO-Revision-Date: 2014-07-09 12:20+0200\n" -"Last-Translator: Peter Dave Hello \n" +"PO-Revision-Date: 2014-08-26 20:02+0200\n" +"Last-Translator: Chien Wei Lin \n" "Language-Team: Traditional Chinese " "\n" "Language: zh_TW\n" @@ -25,17 +25,17 @@ msgstr "系統上找不到 %s 檔案，詳情請參考 www.phpmyadmin.net。" #: db_create.php:61 #, php-format msgid "Database %1$s has been created." -msgstr "資料庫 %1$s 建立成功。" +msgstr "己建立資料庫 %1$s。" #: db_datadict.php:52 libraries/operations.lib.php:32 msgid "Database comment:" -msgstr "資料庫備註:" +msgstr "資料庫備註：" #: db_datadict.php:159 libraries/schema/Pdf_Relation_Schema.class.php:1329 #: libraries/tbl_columns_definition_form.lib.php:70 #: libraries/tbl_printview.lib.php:578 msgid "Table comments:" -msgstr "資料表備註:" +msgstr "資料表備註：" #: db_datadict.php:168 libraries/Index.class.php:567 #: libraries/TableSearch.class.php:185 libraries/TableSearch.class.php:1291 @@ -4024,7 +4024,7 @@ msgstr "無效的伺服器索引: %s" #: libraries/common.inc.php:643 #, php-format msgid "Invalid hostname for server %1$s. Please review your configuration." -msgstr "伺服器 %1$s 主機名稱錯誤，請檢查設定檔案。" +msgstr "伺服器 %1$s 主機名稱無效，請重新檢查您的設定檔。" #: libraries/common.inc.php:659 #, php-format From 3a9e2bbf654ebc9c25746590d8645e59c3381582 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 27 Aug 2014 12:54:26 -0400 Subject: [PATCH 4/4] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index c796c30142..5779154ef2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ phpMyAdmin - ChangeLog - bug #4521 Initially allowed chart types do not match selected data - bug #4518 Export to SQL: CREATE TABLE option AUTO_INCREMENT ignored - bug #4522 Duplicate column names while assigning index +- bug #4487 Export of partitioned table does not import 4.2.7.1 (2014-08-17) - bug #4501 [security] XSS in table browse page