From 8f7012fe64ba9d6b28edaf585d0f0f0220141600 Mon Sep 17 00:00:00 2001 From: FAMMA TV NOTICIAS MEDIOS DE CO Date: Sat, 7 Feb 2015 04:33:58 +0100 Subject: [PATCH 1/2] Translated using Weblate (Spanish) Currently translated at 100.0% (2979 of 2979 strings) [CI skip] --- po/es.po | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/po/es.po b/po/es.po index e4835d5893..b7a9dfad23 100644 --- a/po/es.po +++ b/po/es.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2015-02-04 09:52+0200\n" -"Last-Translator: Jorge Famma Tinoco Gomez " +"PO-Revision-Date: 2015-02-07 04:33+0200\n" +"Last-Translator: FAMMA TV NOTICIAS MEDIOS DE CO " "\n" "Language-Team: Spanish " "\n" @@ -1661,7 +1661,7 @@ msgstr "Cargando…" #: js/messages.php:252 msgid "Request Aborted!!" -msgstr "¡Pedido cancelado!" +msgstr "Petición abortado!!" #: js/messages.php:253 msgid "Processing Request" @@ -6360,7 +6360,6 @@ msgstr "" "para mostrar un cuadro de filtro." #: libraries/config/messages.inc.php:440 -#, fuzzy msgid "Minimum number of items to display the filter box" msgstr "Número mínimo de elementos para mostrar la caja de filtro" @@ -6827,10 +6826,9 @@ msgstr "" "sugerido: [kbd]pma__savedsearches[/kbd]." #: libraries/config/messages.inc.php:607 -#, fuzzy #| msgid "Central columns" msgid "Central columns table" -msgstr "Columnas centrales" +msgstr "Tabla de columnas centrales" #: libraries/config/messages.inc.php:609 #| msgid "" @@ -9316,7 +9314,7 @@ msgstr "" "(«%1$s») sólo contiene una columna." #: libraries/normalization.lib.php:381 -#, fuzzy, php-format +#, php-format #| msgid "" #| "As per above partial dependencies, in order to put the original table " #| "'%1$s' into Second normal form we need to create the following tables:" From c4f87ea6154d465036a138b6f1b9eb6108156a91 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 7 Feb 2015 08:18:15 -0500 Subject: [PATCH 2/2] Bug Undefined index navwork Signed-off-by: Marc Delisle --- ChangeLog | 1 + navigation.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c29172d0d8..a99de8e6b9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.3.10.0 (not yet released) +- bug Undefined index navwork 4.3.9.0 (2015-02-05) - bug #4728 Incorrect headings in routine editor diff --git a/navigation.php b/navigation.php index 2c35311e50..2b1b85a5d2 100644 --- a/navigation.php +++ b/navigation.php @@ -24,7 +24,7 @@ if (! $response->isAjax()) { } $cfgRelation = PMA_getRelationsParam(); -if ($cfgRelation['navwork']) { +if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) { if (isset($_REQUEST['hideNavItem'])) { if (! empty($_REQUEST['itemName']) && ! empty($_REQUEST['itemType'])