From 1607167439863f18561eb58462a24687386a72b9 Mon Sep 17 00:00:00 2001 From: "Ann + J.M" Date: Thu, 4 Dec 2014 20:28:35 +0100 Subject: [PATCH 1/3] Translated using Weblate (German) Currently translated at 100.0% (2978 of 2978 strings) [CI skip] --- po/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index 643ec81dba..3fb29c31ae 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-11-13 11:57-0500\n" -"PO-Revision-Date: 2014-12-01 16:54+0200\n" -"Last-Translator: Jan Erik Zassenhaus \n" +"PO-Revision-Date: 2014-12-04 20:28+0200\n" +"Last-Translator: Ann + J.M. \n" "Language-Team: German " "\n" "Language: de\n" @@ -13806,7 +13806,7 @@ msgstr "Ist ein Fremdschlüssel." #: libraries/tbl_columns_definition_form.lib.php:616 msgid "Pick from Central Columns" -msgstr "Wählen Sie aus zentralen Spalten" +msgstr "Aus zentralen Spalten wählen" #: libraries/tbl_columns_definition_form.lib.php:802 msgid "first" From e07d92920b61aa552c2deddd4ac6d38f800d818b Mon Sep 17 00:00:00 2001 From: Igor Date: Thu, 4 Dec 2014 23:10:29 +0100 Subject: [PATCH 2/3] Translated using Weblate (Ukrainian) Currently translated at 91.0% (2712 of 2978 strings) [CI skip] --- po/uk.po | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/po/uk.po b/po/uk.po index 5e95dcecb1..d91d474a26 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-11-13 11:57-0500\n" -"PO-Revision-Date: 2014-08-20 00:51+0200\n" -"Last-Translator: Alex Smirnov \n" -"Language-Team: Ukrainian \n" +"PO-Revision-Date: 2014-12-04 23:10+0200\n" +"Last-Translator: Igor \n" +"Language-Team: Ukrainian " +"\n" +"Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: uk\n" -"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Weblate 1.10-dev\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=" +"4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" +"X-Generator: Weblate 2.1-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -27,17 +27,17 @@ msgstr "" #: db_central_columns.php:85 msgid "The central list of columns for the current database is empty." -msgstr "" +msgstr "Центральний перелік колонок для поточної бази даних порожній." #: db_central_columns.php:109 msgid "Click to sort." msgstr "Клацніть для сортування." #: db_central_columns.php:125 -#, fuzzy, php-format +#, php-format #| msgid "Showing row(s) %1$s - %2$s" msgid "Showing rows %1$s - %2$s." -msgstr "Показано рядки %1$s - %2$s" +msgstr "Показано рядки %1$s - %2$s." #: db_create.php:61 #, php-format @@ -255,15 +255,13 @@ msgid "Database %1$s has been copied to %2$s." msgstr "Базу даних %1$s було скопійовано до %2$s." #: db_operations.php:263 -#, fuzzy, php-format +#, php-format #| msgid "" #| "The phpMyAdmin configuration storage has been deactivated. To find out " #| "why click %shere%s." msgid "" "The phpMyAdmin configuration storage has been deactivated. %sFind out why%s." -msgstr "" -"Сховище конфігурації phpMyAdmin деактивовано. Для того, щоб довідатись чому, " -"натисніть %sтут%s." +msgstr "Сховище конфігурації phpMyAdmin деактивовано. %sДовідайтесь чому%s." #: db_printview.php:48 db_tracking.php:83 db_tracking.php:207 #: libraries/Menu.class.php:241 libraries/config/messages.inc.php:756 From 573f85f1bffb7094275874d853d452212383b002 Mon Sep 17 00:00:00 2001 From: Chirayu Chiripal Date: Fri, 5 Dec 2014 16:05:48 +0530 Subject: [PATCH 3/3] Fix bug-4613 HHVM: method ob_gzhandler not found Signed-off-by: Chirayu Chiripal --- ChangeLog | 1 + libraries/OutputBuffering.class.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 08112b09d5..4ddbf20fc4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -11,6 +11,7 @@ phpMyAdmin - ChangeLog - bug Undefined index navwork, savedsearcheswork, fields - bug #4620 Undefined index while adding to the central columns list - bug #4618 Page scrolls while GIS visualization is zoomed in/out with mousewheel +- bug #4613 HHVM: method 'ob_gzhandler' not found 4.3.0.0 (not yet released) + rfe #1502 Smart sorting for int keys diff --git a/libraries/OutputBuffering.class.php b/libraries/OutputBuffering.class.php index 62ad49cb4f..f1ad55bfd7 100644 --- a/libraries/OutputBuffering.class.php +++ b/libraries/OutputBuffering.class.php @@ -84,7 +84,8 @@ class PMA_OutputBuffering public function start() { if (! $this->_on) { - if ($this->_mode) { + // HHVM as of 3.4.0 does not support ob_gzhandler + if ($this->_mode && ! defined('HHVM_VERSION')) { ob_start('ob_gzhandler'); } ob_start();