gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_6'

Browse Source 
Fix merge conflicts in po/pt_BR.po

Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
This commit is contained in:
Isaac Bennetch 2016-03-30 09:39:08 -04:00
commit 18670840c8
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -15,6 +15,7 @@ phpMyAdmin - ChangeLog
- issue #12118 Fixed activation of some languages
- issue #12121 Fixed error in 3NF step of normalization
- issue #12135 Fix offering JSON datatype in incompatible MySQL versions
- issue #12132 Can not open table with JSON field
4.6.0.0 (2016-03-22)
+ issue #11456 Disabled storage engines

8
libraries/dbi/DBIMysqli.php
View File

@ -43,7 +43,9 @@ if (! defined('MYSQLI_TYPE_NEWDECIMAL')) {
if (! defined('MYSQLI_TYPE_BIT')) {
define('MYSQLI_TYPE_BIT', 16);
}
if (! defined('MYSQLI_TYPE_JSON')) {
define('MYSQLI_TYPE_JSON', 245);
}
/* vim: set expandtab sw=4 ts=4 sts=4: */
@ -499,9 +501,7 @@ class DBIMysqli implements DBIExtension
//$typeAr[MYSQLI_TYPE_CHAR] = 'string';
$typeAr[MYSQLI_TYPE_GEOMETRY] = 'geometry';
$typeAr[MYSQLI_TYPE_BIT] = 'bit';
if (defined('MYSQLI_TYPE_JSON')) {
$typeAr[MYSQLI_TYPE_JSON] = 'json';
}
$typeAr[MYSQLI_TYPE_JSON] = 'json';
$fields = mysqli_fetch_fields($result);

7
po/pt_BR.po
View File

@ -4,8 +4,8 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 4.7.0-dev\n"
"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
"POT-Creation-Date: 2016-02-17 11:55+0100\n"
"PO-Revision-Date: 2016-02-29 19:37+0000\n"
"Last-Translator: Kenzo Martins Matuzawa <kenzo.matuzawa@gmail.com>\n"
"PO-Revision-Date: 2016-03-29 18:28+0000\n"
"Last-Translator: Ricardo Crivelli <ricardocrivelli@gmail.com>\n"
"Language-Team: Portuguese (Brazil) "
"<https://hosted.weblate.org/projects/phpmyadmin/master/pt_BR/>\n"
"Language: pt_BR\n"
@ -13,7 +13,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
"X-Generator: Weblate 2.5-dev\n"
"X-Generator: Weblate 2.6-dev\n"
#: changelog.php:37 license.php:33
#, php-format
@ -4746,7 +4746,6 @@ msgid "Analyze Explain at %s"
msgstr ""
#: libraries/Util.php:1249
#, fuzzy
#| msgid "Without PHP Code"
msgid "Without PHP code"
msgstr "Sem código PHP"