From a3d0f5fdd907d73ab7c4413e64afdcc6e121fb34 Mon Sep 17 00:00:00 2001
From: diprofinfiniti <anonynuine-999@yahoo.com>
Date: Fri, 28 Aug 2015 04:47:46 +0200
Subject: [PATCH 1/2] Translated using Weblate (Malay)

Currently translated at 10.7% (344 of 3207 strings)

[CI skip]
---
 po/ms.po | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/po/ms.po b/po/ms.po
index 2cb09ece67..36292fcb62 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2015-08-22 07:48-0400\n"
-"PO-Revision-Date: 2015-08-27 12:46+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2015-08-28 04:47+0200\n"
+"Last-Translator: diprofinfiniti <anonynuine-999@yahoo.com>\n"
 "Language-Team: Malay <https://hosted.weblate.org/projects/phpmyadmin/4-5/ms/>"
 "\n"
 "Language: ms\n"
@@ -26,7 +26,7 @@ msgstr ""
 
 #: db_central_columns.php:105
 msgid "The central list of columns for the current database is empty."
-msgstr ""
+msgstr "Senarai utama lajur untuk pangkalan data semasa adalah kosong"
 
 #: db_central_columns.php:130
 msgid "Click to sort."
@@ -50,10 +50,9 @@ msgstr "Komen pangkalan data:"
 #: db_datadict.php:95
 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:967
 #: templates/columns_definitions/column_definitions_form.phtml:79
-#, fuzzy
 #| msgid "Table comments"
 msgid "Table comments:"
-msgstr "Komen jadual"
+msgstr "Jadual Komen:"
 
 #: db_datadict.php:104 libraries/Index.class.php:699
 #: libraries/insert_edit.lib.php:1565
@@ -339,22 +338,22 @@ msgid "Access denied!"
 msgstr "Akses dinafikan!"
 
 #: db_tracking.php:40 db_tracking.php:65
-#, fuzzy
 #| msgid "Chart generated successfully."
 msgid "Tracking data deleted successfully."
-msgstr "Bebenang %s telah berjaya dimatikan."
+msgstr "Penjejak data telah berjaya dihapuskan."
 
 #: db_tracking.php:49
 #, php-format
 msgid ""
 "Version %1$s was created for selected tables, tracking is active for them."
 msgstr ""
+"Versi %1$s telah dicipta untuk jadual-jadual terpilih, penjejak telah "
+"diaktifkan."
 
 #: db_tracking.php:80
-#, fuzzy
 #| msgid "With selected:"
 msgid "No tables selected."
-msgstr "Dengan pilihan:"
+msgstr "Tiada jadual dipilih."
 
 #: db_tracking.php:134
 msgid "Database Log"

From 2c4ef3888dbb59b01289f023ef8fa323f621a7ec Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Fri, 28 Aug 2015 19:44:33 +1000
Subject: [PATCH 2/2] Fix bug - Do not export `sys` database when exporting
 server

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 ChangeLog                        | 1 +
 libraries/display_export.lib.php | 5 +----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa92881a23..c3ef6124c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -94,6 +94,7 @@ phpMyAdmin - ChangeLog
 + issue #11414 Unclear export options / organization / hierarchy
                Set minimum required PHP version to 5.5 (older versions are EOL)
 - issue #11407 ALTER TABLE failing on import when table exists
+- issue        Do not export `sys` database when exporting server 
 
 4.4.15.0 (not yet released)
 - issue #11411 Undefined "replace" function on numeric scalar
diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php
index 48615fa297..2613cd9d13 100644
--- a/libraries/display_export.lib.php
+++ b/libraries/display_export.lib.php
@@ -61,10 +61,7 @@ function PMA_getHtmlForExportSelectOptions($tmp_select = '')
     }
 
     foreach ($GLOBALS['pma']->databases as $current_db) {
-        if ($current_db == 'information_schema'
-            || $current_db == 'performance_schema'
-            || $current_db == 'mysql'
-        ) {
+        if ($GLOBALS['dbi']->isSystemSchema($current_db, true)) {
             continue;
         }
         if (isset($_GET['db_select'])) {