From f6d74afc9fa2c8d397aad85177cd0139a18deec5 Mon Sep 17 00:00:00 2001 From: Dieter Adriaenssens Date: Sat, 28 Dec 2013 19:11:57 +0100 Subject: [PATCH 1/4] Translated using Weblate (Dutch) Currently translated at 100.0% (2749 of 2749) --- po/nl.po | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/po/nl.po b/po/nl.po index fcaef8d212..4587e157c1 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-27 10:57-0500\n" -"PO-Revision-Date: 2013-12-19 16:09+0200\n" +"PO-Revision-Date: 2013-12-28 19:11+0200\n" "Last-Translator: Dieter Adriaenssens \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -7070,6 +7070,8 @@ msgid "" "Skip this number of queries (for SQL) or lines (for other formats), starting " "from the first one:" msgstr "" +"Sla dit aantal queries (voor SQL) of regels (voor andere formaten) over, " +"beginnend bij de eerste :" #: libraries/display_import.lib.php:342 msgid "Format-Specific Options:" From c1d8d80f754bf2d9853c4b8a71d1be1358a7b6d0 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 30 Dec 2013 11:05:03 -0500 Subject: [PATCH 2/4] bug #3920 Lost space in navigation area Signed-off-by: Marc Delisle --- ChangeLog | 1 + js/navigation.js | 29 +++++++++---------- .../navigation/NavigationHeader.class.php | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6ab5e03e3..c3319c1d38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -10,6 +10,7 @@ phpMyAdmin - ChangeLog - bug #4205 Add a user shows additional "edit user group" link - bug #4202 Cannot read property 'token' of undefined - bug #4203 On refreshing designer, $.FullScreen is undefined +- bug #3920 Lost space in navigation area 4.1.2.0 (2013-12-23) - bug #4178 Quick edit for BIT type does not work diff --git a/js/navigation.js b/js/navigation.js index 8a8655fc6a..9132cd4453 100644 --- a/js/navigation.js +++ b/js/navigation.js @@ -43,10 +43,19 @@ $(function () { */ $('#pma_navigation_reload').live('click', function (event) { event.preventDefault(); - $('#pma_navigation .throbber') - .first() - .css('visibility', 'visible'); + // reload icon object + var $icon = $(this).find('img'); + // source of the hidden throbber icon + var icon_throbber_src = $('#pma_navigation .throbber').attr('src'); + // source of the reload icon + var icon_reload_src = $icon.attr('src'); + // replace the source of the reload icon with the one for throbber + $icon.attr('src', icon_throbber_src); PMA_reloadNavigation(); + // after one second, put back the reload icon + setTimeout(function () { + $icon.attr('src', icon_reload_src); + }, 1000); }); /** @@ -260,7 +269,7 @@ function expandTreeNode($expandElem, callback) var $throbber = $('#pma_navigation .throbber') .first() .clone() - .css('visibility', 'visible') + .css({visibility: 'visible', display: 'block'}) .click(false); $icon.hide(); $throbber.insertBefore($icon); @@ -557,12 +566,6 @@ function PMA_showCurrentNavigation() * @return void */ function PMA_reloadNavigation(callback) { - var $throbber = $('#pma_navigation .throbber') - .first() - .css({ - 'visibility' : 'visible', - 'display' : 'block' - }); var params = { reload: true, pos: $('#pma_navigation_tree').find('a.expander:first > span.pos').text() @@ -605,10 +608,6 @@ function PMA_reloadNavigation(callback) { }); var url = $('#pma_navigation').find('a.navigation_url').attr('href'); $.post(url, params, function (data) { - // Hide throbber if it's visible - $('#pma_navigation .throbber') - .first() - .css('visibility', 'hidden'); if (data.success) { $('#pma_navigation_tree').html(data.message).children('div').show(); PMA_showCurrentNavigation(); @@ -1127,7 +1126,7 @@ PMA_fastFilter.filter.prototype.request = function () $('#pma_navigation_content') .find('img.throbber') .clone() - .css('visibility', 'visible') + .css({visibility: 'visible', display: 'block'}) ) ); } diff --git a/libraries/navigation/NavigationHeader.class.php b/libraries/navigation/NavigationHeader.class.php index 554f5d7a26..ea6e2f2d5c 100644 --- a/libraries/navigation/NavigationHeader.class.php +++ b/libraries/navigation/NavigationHeader.class.php @@ -53,7 +53,7 @@ class PMA_NavigationHeader $buffer .= PMA_Util::getImage( 'ajax_clock_small.gif', __('Loading…'), - array('style' => 'visibility: hidden;', 'class' => 'throbber') + array('style' => 'visibility: hidden; display:none', 'class' => 'throbber') ); $buffer .= ''; // pma_navigation_header $buffer .= '
'; From 633e371ef4ad200de50a59ffc53ab79ae30424bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Mon, 30 Dec 2013 08:18:32 +0100 Subject: [PATCH 3/4] Translated using Weblate (Estonian) Currently translated at 100.0% (2749 of 2749) --- po/et.po | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/po/et.po b/po/et.po index 4f448285f2..ef3a5b5dc9 100644 --- a/po/et.po +++ b/po/et.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-27 10:57-0500\n" -"PO-Revision-Date: 2013-12-28 09:27+0200\n" +"PO-Revision-Date: 2013-12-30 08:18+0200\n" "Last-Translator: Kristjan Räts \n" "Language-Team: Estonian \n" "Language: et\n" @@ -6958,9 +6958,7 @@ msgstr "" msgid "" "Skip this number of queries (for SQL) or lines (for other formats), starting " "from the first one:" -msgstr "" -"Jäta vahele see arv päringuid (SQL) või ridu (muud formaadid), alates " -"esimesest:" +msgstr "Jäta vahele nii palju SQL päringuid või ridu, alates esimesest:" #: libraries/display_import.lib.php:342 msgid "Format-Specific Options:" From ece3ddeae0ef56ce859098ac31f2f1aa078ed6a7 Mon Sep 17 00:00:00 2001 From: Nicu Plai Date: Mon, 30 Dec 2013 14:30:43 +0100 Subject: [PATCH 4/4] Translated using Weblate (Romanian) Currently translated at 59.3% (1631 of 2749) --- po/ro.po | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/po/ro.po b/po/ro.po index 261908ad8d..9dd45f544f 100644 --- a/po/ro.po +++ b/po/ro.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.1.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-12-27 10:57-0500\n" -"PO-Revision-Date: 2013-12-26 10:39+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2013-12-30 14:30+0200\n" +"Last-Translator: Nicu Plai \n" "Language-Team: Romanian \n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -497,10 +497,10 @@ msgid "SRID:" msgstr "SRID" #: gis_data_editor.php:186 -#, fuzzy, php-format +#, php-format #| msgid "Geometry" msgid "Geometry %d:" -msgstr "Geometrie" +msgstr "Geometrie %d:" #: gis_data_editor.php:208 msgid "Point:" @@ -528,25 +528,24 @@ msgid "Add a point" msgstr "Adaugă un punct" #: gis_data_editor.php:264 -#, fuzzy, php-format +#, php-format #| msgid "Lines terminated by" msgid "Linestring %d:" -msgstr "Linii terminate de" +msgstr "Rând de caractere %d:" #: gis_data_editor.php:267 gis_data_editor.php:343 msgid "Outer ring:" -msgstr "" +msgstr "Inelul exterior:" #: gis_data_editor.php:269 gis_data_editor.php:345 #, php-format msgid "Inner ring %d:" -msgstr "" +msgstr "Inelul interior %d:" #: gis_data_editor.php:305 -#, fuzzy #| msgid "Add a new User" msgid "Add a linestring" -msgstr "Adaugă un utilizator nou" +msgstr "Adaugă un nou rând de caractere" #: gis_data_editor.php:306 gis_data_editor.php:380 js/messages.php:334 #, fuzzy @@ -555,10 +554,10 @@ msgid "Add an inner ring" msgstr "Adaugă un utilizator nou" #: gis_data_editor.php:327 -#, fuzzy, php-format +#, php-format #| msgid "Polygon" msgid "Polygon %d:" -msgstr "Poligon" +msgstr "Poligon %d:" #: gis_data_editor.php:386 js/messages.php:335 msgid "Add a polygon" @@ -615,6 +614,8 @@ msgid "" "Choose \"GeomFromText\" from the \"Function\" column and paste the string " "below into the \"Value\" field" msgstr "" +"Alege \"GeomFromText\" din coloana \"Function\" si salveaza valoarea alaturata " +"in atributul \"Value\"" #: import.php:116 #, php-format