From 19308231b3604c7fd9fa77fde2f6b27afe6a68af Mon Sep 17 00:00:00 2001 From: Ray Santos Date: Thu, 25 Feb 2016 16:09:52 +0100 Subject: [PATCH 1/2] Translated using Weblate (Portuguese (Brazil)) Currently translated at 92.2% (2962 of 3211 strings) [CI skip] --- po/pt_BR.po | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index b08d48cbb7..7946fdc76e 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.6.0-alpha1\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-02-17 11:55+0100\n" -"PO-Revision-Date: 2016-02-23 17:18+0000\n" -"Last-Translator: Yury Vidal \n" +"PO-Revision-Date: 2016-02-25 16:09+0000\n" +"Last-Translator: Ray Santos \n" "Language-Team: Portuguese (Brazil) " "\n" "Language: pt_BR\n" @@ -964,7 +964,7 @@ msgstr "Você realmente deseja remover a(s) partição(ões) seleciona(s)?" #, fuzzy #| msgid "Do you really want to execute \"%s\"?" msgid "Do you really want to RESET SLAVE?" -msgstr "Você realmente deseja REINICIAR O ESCRAVO?" +msgstr "Você realmente deseja REINICIAR O SLAVE?" #: js/messages.php:88 msgid "" @@ -4682,6 +4682,8 @@ msgid "" "Stores and enables efficient access to data in JSON (JavaScript Object " "Notation) documents" msgstr "" +"Armazena e permite o acesso eficiente aos dados em documentos JSON (" +"JavaScript Object Notation)" #: libraries/TypesMySQL.php:479 msgctxt "numeric types" @@ -4718,7 +4720,7 @@ msgstr "Dados estáticos" #: libraries/Util.php:689 #, php-format msgid "%d errors were found during analysis." -msgstr "" +msgstr "%d 1 erros foram encontrados durante a análise." #: libraries/Util.php:752 libraries/rte/rte_events.lib.php:113 #: libraries/rte/rte_events.lib.php:122 libraries/rte/rte_events.lib.php:153 @@ -5564,10 +5566,13 @@ msgid "Enable CodeMirror" msgstr "Habilitar CodeMirror" #: libraries/config/messages.inc.php:64 +#, fuzzy msgid "" "Find any errors in the query before executing it. Requires CodeMirror to be " "enabled." msgstr "" +"Encontrar algum erro na consulta antes de executá-la. Requer CodeMirror para " +"ser ativado." #: libraries/config/messages.inc.php:67 #, fuzzy @@ -5649,9 +5654,10 @@ msgid "Confirm DROP queries" msgstr "Confirma queries DROP" #: libraries/config/messages.inc.php:97 +#, fuzzy msgid "" "Log SQL queries and their execution time, to be displayed in the console" -msgstr "" +msgstr "Log consultas SQL e seu tempo de execução, para ser exibido no console" #: libraries/config/messages.inc.php:101 msgid "Tab that is displayed when entering a database." @@ -5700,8 +5706,11 @@ msgid "Show column comments" msgstr "Mostrar comentários da tabela" #: libraries/config/messages.inc.php:119 +#, fuzzy msgid "Whether column comments should be shown in table structure view" msgstr "" +"Se os comentários das colunas devem ser mostrados na estrutura de " +"visualização de tabelas" #: libraries/config/messages.inc.php:120 msgid "Hide table structure actions" @@ -5949,10 +5958,13 @@ msgid "Use hexadecimal for BINARY & BLOB" msgstr "Usar hexadecimal para BINARY e BLOB" #: libraries/config/messages.inc.php:211 +#, fuzzy msgid "" "Add IF NOT EXISTS (less efficient as indexes will be generated during table " "creation)" msgstr "" +"Adicionar IF NOT EXISTS (menos eficiente como índices serão gerados durante " +"a criação da tabela)" #: libraries/config/messages.inc.php:214 msgid "Use ignore inserts" @@ -6002,8 +6014,9 @@ msgid "Foreign key limit" msgstr "Limite de chave estrangeira" #: libraries/config/messages.inc.php:242 +#, fuzzy msgid "Default value for foreign key checks checkbox for some queries." -msgstr "" +msgstr "valor padrão para foreign key checa checkbox por qualquer consultas." #: libraries/config/messages.inc.php:244 #, fuzzy From 88e0944cfd6c74c32bd57e209eaedbb32dd8314f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 29 Feb 2016 12:11:56 +0100 Subject: [PATCH 2/2] Honor vendor configuration for gettext inclusion MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #12048 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/sql-parser/autoload.php | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 505b62b2c3..0c72e028a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,7 @@ phpMyAdmin - ChangeLog - issue #12012 Column definition with default value and comment in CREATE TABLE expoerted faulty. - issue #12020 New statement but no delimiter and unexpected token with REPLACE. - issue #12029 Fixed incorrect usage of SQL parser context in SQL export +- issue #12048 Fixed inclusion of gettext library from SQL parser 4.5.5.0 (2016-02-22) - issue Undefined index: is_ajax_request diff --git a/libraries/sql-parser/autoload.php b/libraries/sql-parser/autoload.php index 21298b6ced..f12057f211 100644 --- a/libraries/sql-parser/autoload.php +++ b/libraries/sql-parser/autoload.php @@ -67,7 +67,8 @@ class AutoloaderInit // This must be included before any class of the parser is loaded because // if there is no `__` function defined, the library defines a dummy one // in `common.php`. -require_once './libraries/php-gettext/gettext.inc'; +require_once './libraries/vendor_config.php'; +require_once GETTEXT_INC; // Initializing the autoloader. return AutoloaderInit::getLoader(