From 80a85d80e23348983cfc932b8c690ee6aa790f9f Mon Sep 17 00:00:00 2001 From: Douglas Rafael Morais Kollar Date: Thu, 5 Mar 2015 14:37:13 +0100 Subject: [PATCH 1/4] Translated using Weblate (Portuguese (Brazil)) Currently translated at 95.2% (2887 of 3032 strings) [CI skip] --- po/pt_BR.po | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/po/pt_BR.po b/po/pt_BR.po index e262c44ba2..189aa9b14d 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-04 12:49-0500\n" -"PO-Revision-Date: 2015-03-05 14:29+0200\n" -"Last-Translator: Junior Zancan \n" +"PO-Revision-Date: 2015-03-05 14:37+0200\n" +"Last-Translator: Douglas Rafael Morais Kollar \n" "Language-Team: Portuguese (Brazil) " "\n" "Language: pt_BR\n" @@ -4612,7 +4612,6 @@ msgid "Create PHP Code" msgstr "Criar código PHP" #: libraries/Util.class.php:1275 -#, fuzzy #| msgid "Edit index" msgctxt "Inline edit query" msgid "Edit inline" @@ -4814,7 +4813,6 @@ msgid "Length/Values" msgstr "Tamanho/Valores" #: libraries/central_columns.lib.php:663 -#, fuzzy #| msgid "Attributes" msgid "Attribute" msgstr "Atributos" @@ -5153,7 +5151,7 @@ msgid "Key should contain letters, numbers [em]and[/em] special characters." msgstr "A chave deve conter letras, números, [em]e[/em] caracteres especiais." #: libraries/config/ServerConfigChecks.class.php:371 -#, fuzzy, php-format +#, php-format #| msgid "" #| "This %soption%s should be disabled as it allows attackers to bruteforce " #| "login to any MySQL server. If you feel this is necessary, use %strusted " @@ -5167,12 +5165,12 @@ msgid "" "protection with trusted proxies list may not be reliable if your IP belongs " "to an ISP where thousands of users, including you, are connected to." msgstr "" -"Esta %sopção%s deveria ser desabilitada pois ela permite que invasores fazer " -"login por força bruta em qualquer servidor MySQL. Se você acha que ela é " -"necessária, use a %slista de proxies confiáveis%s. Entretanto, proteções " -"baseadas no protocolo IP podem não ser confiáveis se seu endereço IP " -"pertence a um ISP onde centenas de usuários, incluindo você, estão " -"conectados." +"Esta %soption%s deveria ser desabilitada pois ela permite que invasores " +"fazer login por força bruta em qualquer servidor MySQL. Se você acha que ela " +"é necessária, use %srestrict login to MySQL server%s ou %strusted proxies " +"list%s. Entretanto, proteções baseadas no protocolo IP podem não ser " +"confiáveis se seu endereço IP pertence a um PROVEDOR onde centenas de " +"usuários, incluindo você, estão conectados." #: libraries/config/ServerConfigChecks.class.php:381 msgid "" @@ -7753,7 +7751,7 @@ msgstr "Páginas para remover" #: libraries/db_designer.lib.php:77 msgid "Save to selected page" -msgstr "Salvar para a página selecionada." +msgstr "Salvar para a página selecionada" #: libraries/db_designer.lib.php:78 msgid "Create a page and save to it" @@ -13729,16 +13727,14 @@ msgid "Propose table structure" msgstr "Propor estrutura de tabela" #: libraries/structure.lib.php:1648 -#, fuzzy #| msgid "Propose table structure" msgid "Improve table structure" -msgstr "Propor estrutura de tabela" +msgstr "Melhorar a estrutura da tabela" #: libraries/structure.lib.php:1655 -#, fuzzy #| msgid "Track table" msgid "Track view" -msgstr "Monitorar tabela" +msgstr "Monitorar visão" #: libraries/structure.lib.php:1696 #: libraries/tbl_columns_definition_form.lib.php:187 @@ -13747,7 +13743,6 @@ msgid "Add %s column(s)" msgstr "Adicionar campo(s) %s" #: libraries/structure.lib.php:1705 -#, fuzzy #| msgid "At Beginning of Table" msgid "at beginning of table" msgstr "No início da tabela" @@ -13756,7 +13751,7 @@ msgstr "No início da tabela" #: libraries/tbl_columns_definition_form.lib.php:827 #, php-format msgid "after %s" -msgstr "depois %s" +msgstr "depois de %s" #: libraries/structure.lib.php:1805 msgid "Row statistics" From de5fbf546a3f4114f54a10c624899832eefde8c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?= =?UTF-8?q?=CF=82=20=CE=A0=CE=B1=CF=80=CE=AC=CE=B6=CE=BF=CE=B3=CE=BB=CE=BF?= =?UTF-8?q?=CF=85?= Date: Thu, 5 Mar 2015 14:39:53 +0100 Subject: [PATCH 2/4] Translated using Weblate (Greek) Currently translated at 100.0% (3032 of 3032 strings) [CI skip] --- po/el.po | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/po/el.po b/po/el.po index c35f078adc..a26e02d4f6 100644 --- a/po/el.po +++ b/po/el.po @@ -4,14 +4,14 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.4.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-03-04 12:49-0500\n" -"PO-Revision-Date: 2015-03-03 07:22+0200\n" +"PO-Revision-Date: 2015-03-05 14:39+0200\n" "Last-Translator: Παναγιώτης Παπάζογλου \n" -"Language-Team: Greek \n" +"Language-Team: Greek " +"\n" +"Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: el\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Weblate 2.3-dev\n" @@ -11607,7 +11607,7 @@ msgstr "Δεν υπάρχουν συμβάντα για εμφάνιση." #: libraries/select_lang.lib.php:613 msgid "Ignoring unsupported language code." -msgstr "" +msgstr "Αγνόηση μη υποστηριζόμενου κωδικού γλώσσας." #: libraries/select_server.lib.php:41 libraries/select_server.lib.php:46 msgid "Current Server:" @@ -11900,7 +11900,6 @@ msgstr "Απαιτείται SSL" #: libraries/server_privileges.lib.php:759 #: libraries/server_privileges.lib.php:768 -#, fuzzy #| msgid "Requires that a specific cipher method be used for a connection." msgid "Requires that a specific cipher method be used for a connection." msgstr "" From b39933c37b8cce0d9467f60bdfaae4a72d520893 Mon Sep 17 00:00:00 2001 From: Daniyal Shahid Date: Fri, 6 Mar 2015 00:34:37 +0500 Subject: [PATCH 3/4] Fix for #4788 Signed-off-by: Daniyal Shahid daniyal36@gmail.com Added a top margin to the datepicker after a certain window height so that null checkbox is visible --- js/makegrid.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/js/makegrid.js b/js/makegrid.js index ff03f10e7d..0934841e8a 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1026,6 +1026,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $input_field.datepicker("show"); + var datepicker_top = parseInt(document.getElementById("ui-datepicker-div").style.getPropertyValue("top"), 10); + + if (datepicker_top > 370 && !is_null) { + document.getElementById("ui-datepicker-div").style.marginTop = "30px"; + } + if (is_null){ $(g.cEdit).find('.edit_area').hide(); } From 7ceeeb1fbe2eacb6a036598a1fd0ba803ae759ee Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Thu, 5 Mar 2015 15:16:17 -0500 Subject: [PATCH 4/4] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index da314611b6..569ed38416 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,7 @@ phpMyAdmin - ChangeLog - bug #4746 Right-aligned columns have left-aligned header - bug #4779 PMA_Util::parseEnumSetValues fails on enums with UTF-8 values - bug Undefined index savedsearcheswork +- bug #4788 Inline edit of DATE fields with NULL, NULL checkbox is under datepicker 4.3.11.1 (2015-03-04) - bug [security] Risk of BREACH attack, see PMASA-2015-1