From 2936ecc41830be86fc90352e6b19706b55cc26ae Mon Sep 17 00:00:00 2001 From: Domen Date: Sun, 25 Oct 2015 23:52:45 +0100 Subject: [PATCH 1/2] Translated using Weblate (Slovenian) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/sl.po | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/po/sl.po b/po/sl.po index 9af2558a4b..d6e3eaaae2 100644 --- a/po/sl.po +++ b/po/sl.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-26 19:59-0400\n" -"PO-Revision-Date: 2015-10-25 23:52+0200\n" +"PO-Revision-Date: 2015-10-28 00:33+0200\n" "Last-Translator: Domen \n" -"Language-Team: Slovenian \n" +"Language-Team: Slovenian " +"\n" "Language: sl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3;\n" +"Plural-Forms: nplurals=4; plural=n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || " +"n%100==4 ? 2 : 3;\n" "X-Generator: Weblate 2.5-dev\n" #: changelog.php:37 license.php:30 @@ -14488,6 +14488,8 @@ msgid "" "Username and hostname didn't change. If you only want to change the " "password, 'Change password' tab should be used." msgstr "" +"Uporabniškega imena in gostitelja niste spremenili. Če želite spremeniti " +"samo geslo, uporabite zavihek »Spremeni geslo«." #: server_status.php:39 msgid "Not enough privilege to view server status." From 4b4f032046e3fb1efced9931cdb7e66abdd9926f Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 28 Oct 2015 18:42:34 +1100 Subject: [PATCH 2/2] Fix #11614 Undefined variable: db Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/controllers/DatabaseStructureController.class.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3b3e1ebc3e..bcc9a0741d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - issue #11610 Undefined variable: res_rel - issue #11611 Warning while exporting schema to PDF - issue #11612 Undefined index: new_row_format +- issue #11614 Undefined variable: db 4.5.1.0 (2015-10-23) - issue Invalid argument supplied for foreach() diff --git a/libraries/controllers/DatabaseStructureController.class.php b/libraries/controllers/DatabaseStructureController.class.php index 4b4162d324..21f4a04f2a 100644 --- a/libraries/controllers/DatabaseStructureController.class.php +++ b/libraries/controllers/DatabaseStructureController.class.php @@ -475,7 +475,8 @@ class DatabaseStructureController extends DatabaseController $this->response->addHTML( Template::get('database/structure/table_header')->render( array( - 'db_is_system_schema' => false, + 'db' => $this->db, + 'db_is_system_schema' => $this->_db_is_system_schema, 'replication' => $GLOBALS['replication_info']['slave']['status'] ) )