Merge branch 'QA_4_1' of github.com:phpmyadmin/phpmyadmin into QA_4_1

2014-03-01 23:51:23 +05:30 · 2014-03-01 23:51:23 +05:30 · c50e0a22d9
commit c50e0a22d9
parent 54ee8faa96 58f0552e31
27 changed files with 634 additions and 879 deletions
--- a/6
+++ b/6
@ -2,6 +2,12 @@ phpMyAdmin - ChangeLog
 ======================

 4.1.9.0 (not yet released)
+- bug #4279 CTRL + up or down moves two fields (part one)
+- bug #4294 output as text radio clickable for "OpenDocument Text" export 
+- bug #4297 DROP DATABASE tick box in export no longer works
+- bug #4291 Unable to export comments in OpenDocument text format
+- bug #4299 Deletion even when the user says "No" to the confirmation message
+- bug #4303 "New" link in navi panel is shown even if no privileges

 4.1.8.0 (2014-02-22)
 - bug #4276 Login loop on session expiry
--- a/db_search.php
+++ b/db_search.php
@ -40,11 +40,12 @@ $db_search = new PMA_DbSearch($GLOBALS['db']);
 if ( $GLOBALS['is_ajax_request'] != true) {
    include 'libraries/db_info.inc.php';
 }
-$response->addHTML('<div id="searchresults">');

 // Main search form has been submitted, get results
 if (isset($_REQUEST['submit_search'])) {
    $response->addHTML($db_search->getSearchResults());
+} else {
+    $response->addHTML('<div id="searchresults"></div>');
 }

 // If we are in an Ajax request, we need to exit after displaying all the HTML
@ -53,5 +54,9 @@ if ($GLOBALS['is_ajax_request'] == true && empty($_REQUEST['ajax_page_request'])
 }

 // Display the search form
+$response->addHTML('<div id="togglesearchresultsdiv">'
+    . '<a id="togglesearchresultlink"></a></div>'
+    . '<br class="clearfloat" />');
 $response->addHTML($db_search->getSelectionForm($url_params));
+$response->addHTML($db_search->_getResultDivs());
 ?>
--- a/export.php
+++ b/export.php
@ -119,6 +119,7 @@ if (!defined('TESTSUITE')) {
            'sql_max_query_size',
            'sql_hex_for_blob',
            'sql_utc_time',
+            'sql_drop_database',
            'csv_separator',
            'csv_enclosed',
            'csv_escaped',
@ -654,7 +655,8 @@ if (!defined('TESTSUITE')) {

        // Will we need relation & co. setup?
        $do_relation = isset($GLOBALS[$what . '_relation']);
-        $do_comments = isset($GLOBALS[$what . '_include_comments']);
+        $do_comments = isset($GLOBALS[$what . '_include_comments'])
+            || isset($GLOBALS[$what . '_comments']) ;
        $do_mime     = isset($GLOBALS[$what . '_mime']);
        if ($do_relation || $do_comments || $do_mime) {
            $cfgRelation = PMA_getRelationsParam();
--- a/js/db_search.js
+++ b/js/db_search.js
@ -44,15 +44,21 @@ function loadResult(result_path, table_name, link)
        /**  Load the browse results to the page */
        $("#table-info").show();
        $('#table-link').attr({"href" : 'sql.php?' + link }).text(table_name);
-        var url = result_path + " #sqlqueryresults";
-        $('#browse-results').load(url, null, function () {
-            $('html, body')
-                .animate({
-                    scrollTop: $("#browse-results").offset().top
-                }, 1000);
-            PMA_ajaxRemoveMessage($msg);
-            PMA_makegrid($('#table_results')[0], true, true, true, true);
-        }).show();
+        var url = result_path + "#sqlqueryresults";
+        $.get(url, {'ajax_request': true, 'is_js_confirmed': true}, function (data) {
+            if (data.success) {
+                $('#browse-results').html(data.message);
+                $('html, body')
+                    .animate({
+                        scrollTop: $("#browse-results").offset().top
+                    }, 1000);
+                PMA_ajaxRemoveMessage($msg);
+                PMA_makegrid($('#table_results')[0], true, true, true, true);
+                $('#browse-results').show();
+            } else {
+                PMA_ajaxShowMessage(data.error, false);
+            }
+         });
    });
 }

@ -69,7 +75,6 @@ function deleteResult(result_path, msg)
    $(function () {
        /**  Hides the results shown by the browse criteria */
        $("#table-info").hide();
-        $('#browse-results').hide();
        $('#sqlqueryform').hide();
        $('#togglequerybox').hide();
        /** Conformation message for deletion */
@ -77,13 +82,16 @@ function deleteResult(result_path, msg)
            var $msg = PMA_ajaxShowMessage(PMA_messages.strDeleting, false);
            /** Load the deleted option to the page*/
            $('#sqlqueryform').html('');
-            var url = result_path + " #result_query, #sqlqueryform";
-            $('#browse-results').load(url, function () {
+            var url = result_path + "#result_query, #sqlqueryform";
+            $.get(url, {'ajax_request': true, 'is_js_confirmed': true}, 
+                function (data) {
+            if (data.success) {
+                $('#sqlqueryform').html(data.sql_query);
                /** Refresh the search results after the deletion */
                document.getElementById('buttonGo').click();
                $('#togglequerybox').html(PMA_messages.strHideQueryBox);
                /** Show the results of the deletion option */
-                $('#browse-results').show();
+                $('#browse-results').hide();
                $('#sqlqueryform').show();
                $('#togglequerybox').show();
                $('html, body')
@ -91,7 +99,10 @@ function deleteResult(result_path, msg)
                        scrollTop: $("#browse-results").offset().top
                    }, 1000);
                PMA_ajaxRemoveMessage($msg);
-            });
+            } else {
+                PMA_ajaxShowMessage(data.error, false);
+            }
+         });
        }
    });
 }
@ -111,12 +122,10 @@ AJAX.registerOnload('db_search.js', function () {
    /**
     * Prepare a div containing a link for toggle the search results
     */
-    $('<div id="togglesearchresultsdiv"><a id="togglesearchresultlink"></a></div>')
-    .insertAfter('#searchresults')
+    $('#togglesearchresultsdiv')
    /** don't show it until we have results on-screen */
    .hide();

-    $('<br class="clearfloat" />').insertAfter("#togglesearchresultsdiv").show();
    /**
     * Changing the displayed text according to
     * the hide/show criteria in search result forms
@ -139,8 +148,7 @@ AJAX.registerOnload('db_search.js', function () {
     * Prepare a div containing a link for toggle the search form,
     * otherwise it's incorrectly displayed after a couple of clicks
     */
-    $('<div id="togglesearchformdiv"><a id="togglesearchformlink"></a></div>')
-    .insertAfter('#db_search_form')
+    $('#togglesearchformdiv')
    .hide(); // don't show it until we have results on-screen

    /**
--- a/js/export.js
+++ b/js/export.js
@ -132,8 +132,8 @@ function toggle_save_to_file()
        $("#ul_save_asfile > li> select").prop('disabled', true);
    } else {
        $("#ul_save_asfile > li").fadeTo('fast', 1);
-        $("#ul_save_asfile > li > input").removeProp('disabled');
-        $("#ul_save_asfile > li> select").removeProp('disabled');
+        $("#ul_save_asfile > li > input").prop('disabled', false);
+        $("#ul_save_asfile > li> select").prop('disabled', false);
    }
 }

@ -185,9 +185,13 @@ AJAX.registerOnload('export.js', function () {
        var active_plugin = $("#plugins option:selected").val();
        var force_file = $("#force_file_" + active_plugin).val();
        if (force_file == "true") {
+            if ($("#radio_dump_asfile").prop('checked') !== true) {
+                $("#radio_dump_asfile").prop('checked', true);
+                toggle_save_to_file();
+            }
            $("#radio_view_as_text").prop('disabled', true).parent().fadeTo('fast', 0.4);
        } else {
-            $("#radio_view_as_text").removeProp('disabled').parent().fadeTo('fast', 1);
+            $("#radio_view_as_text").prop('disabled', false).parent().fadeTo('fast', 1);
        }
    });
 });
--- a/js/keyhandler.js
+++ b/js/keyhandler.js
@ -1,4 +1,9 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
+
+// gloabl vars to hold Arrow Down event timeStamps
+var prevTimeStamp = 0; 
+var curTimeStamp = 0;
+
 /**
  * Allows moving around inputs/select by Ctrl+arrows
  *
@ -7,6 +12,17 @@
 function onKeyDownArrowsHandler(e)
 {
    e = e || window.event;
+
+    curTimeStamp = e.timeStamp;
+    if( prevTimeStamp == 0 ) {
+        prevTimeStamp = curTimeStamp;
+    }
+    else if( Math.abs(curTimeStamp-prevTimeStamp) < 150 ) {
+        // event in a very quick succession
+        return;
+    }
+    prevTimeStamp = curTimeStamp;
+    
    var o = (e.srcElement || e.target);
    if (!o) {
        return;
@ -14,7 +30,6 @@ function onKeyDownArrowsHandler(e)
    if (o.tagName != "TEXTAREA" && o.tagName != "INPUT" && o.tagName != "SELECT") {
        return;
    }
-    console.log(e);
    if (navigator.userAgent.toLowerCase().indexOf('applewebkit/') != -1) {
        if (e.ctrlKey || e.shiftKey || !e.altKey) {
            return;
--- a/libraries/DbSearch.class.php
+++ b/libraries/DbSearch.class.php
@ -342,7 +342,7 @@ class PMA_DbSearch
        if ($res_cnt > 0) {
            $this_url_params['sql_query'] = $newsearchsqls['select_columns'];
            $browse_result_path = 'sql.php' . PMA_URL_getCommon($this_url_params);
-            $html_output .= '<td><a name="browse_search" href="'
+            $html_output .= '<td><a name="browse_search" class="ajax" href="'
                . $browse_result_path . '" onclick="loadResult(\''
                . $browse_result_path . '\',\'' . $each_table . '\',\''
                . PMA_URL_getCommon($GLOBALS['db'], $each_table) . '\''
@ -350,7 +350,7 @@ class PMA_DbSearch
                . __('Browse') . '</a></td>';
            $this_url_params['sql_query'] = $newsearchsqls['delete'];
            $delete_result_path = 'sql.php' . PMA_URL_getCommon($this_url_params);
-            $html_output .= '<td><a name="delete_search" href="'
+            $html_output .= '<td><a name="delete_search" class="ajax" href="'
                . $delete_result_path . '" onclick="deleteResult(\''
                . $delete_result_path . '\' , \''
                . sprintf(
@ -465,7 +465,8 @@ class PMA_DbSearch
            . __('Go') . '" id="buttonGo" />';
        $html_output .= '</fieldset>';
        $html_output .= '</form>';
-        $html_output .= $this->_getResultDivs();
+        $html_output .= '<div id="togglesearchformdiv">'
+            . '<a id="togglesearchformlink"></a></div>';

        return $html_output;
    }
@ -475,7 +476,7 @@ class PMA_DbSearch
     *
     * @return string div tags
     */
-    private function _getResultDivs()
+    public function _getResultDivs()
    {
        $html_output = '<!-- These two table-image and table-link elements display'
            . ' the table name in browse search results  -->';
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@ -1898,13 +1898,6 @@ $cfg['Export']['sql_type'] = 'INSERT';
 */
 $cfg['Export']['sql_max_query_size'] = 50000;

-/**
- *
- *
- * @global boolean $cfg['Export']['sql_comments']
- */
-$cfg['Export']['sql_comments'] = false;
-
 /**
 *
 *
--- a/libraries/navigation/Nodes/Node_Database_Container.class.php
+++ b/libraries/navigation/Nodes/Node_Database_Container.class.php
@ -29,19 +29,21 @@ class Node_Database_Container extends Node
    {
        parent::__construct($name, Node::CONTAINER);

-        $new        = PMA_NodeFactory::getInstance(
-            'Node', _pgettext('Create new database', 'New')
-        );
-        $new->isNew = $GLOBALS['is_create_db_priv'];
-        $new->icon  = PMA_Util::getImage('b_newdb.png', '');
-        $new->links = array(
-            'text' => 'server_databases.php?server=' . $GLOBALS['server']
-                    . '&amp;token=' . $GLOBALS['token'],
-            'icon' => 'server_databases.php?server=' . $GLOBALS['server']
-                    . '&amp;token=' . $GLOBALS['token'],
-        );
-        $new->classes = 'new_database italics';
-        $this->addChild($new);
+        if ($GLOBALS['is_create_db_priv']) {
+            $new        = PMA_NodeFactory::getInstance(
+                'Node', _pgettext('Create new database', 'New')
+            );
+            $new->isNew = true;
+            $new->icon  = PMA_Util::getImage('b_newdb.png', '');
+            $new->links = array(
+                'text' => 'server_databases.php?server=' . $GLOBALS['server']
+                        . '&amp;token=' . $GLOBALS['token'],
+                'icon' => 'server_databases.php?server=' . $GLOBALS['server']
+                        . '&amp;token=' . $GLOBALS['token'],
+            );
+            $new->classes = 'new_database italics';
+            $this->addChild($new);
+        }
    }
 }
-?>
+?>
--- a/po/ar.po
+++ b/po/ar.po
@ -4,9 +4,9 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-02-02 11:01+0200\n"
+"PO-Revision-Date: 2014-02-27 11:33+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Arabic <http://l10n.cihar.com/projects/phpmyadmin/4-1/ar/>\n"
+"Language-Team: Arabic <https://l10n.cihar.com/projects/phpmyadmin/4-1/ar/>\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -293,12 +293,12 @@ msgstr "آخر فحص"
 #, php-format
 msgid "%s table"
 msgid_plural "%s tables"
-msgstr[0] "%s  جدول (جداول)"
-msgstr[1] "%s  جدول (جداول)"
-msgstr[2] "%s  جدول (جداول)"
-msgstr[3] "%s  جدول (جداول)"
-msgstr[4] "%s  جدول (جداول)"
-msgstr[5] "%s  جدول (جداول)"
+msgstr[0] "%s جدول (جداول)"
+msgstr[1] "%s جدول (جداول)"
+msgstr[2] "%s جدول (جداول)"
+msgstr[3] "%s جدول (جداول)"
+msgstr[4] "%s جدول (جداول)"
+msgstr[5] "%s جدول (جداول)"

 #: db_qbe.php:50
 msgid "You have to choose at least one column to display"
@ -423,12 +423,12 @@ msgstr "سجل قاعدة البيانات"
 msgid ""
 "An error has been detected and an error report has been automatically "
 "submitted based on your settings."
-msgstr ""
+msgstr "تم اكتشاف خطأ، وتلقائياً تم إرسال تقرير بهذا الخطأ بناءً على إعداداتك."

 #: error_report.php:37 error_report.php:54 error_report.php:65
 #: error_report.php:81
 msgid "You may want to refresh the page."
-msgstr ""
+msgstr "لربما يكون من الأفضل أن تقوم بتحديث هذه الصفحة."

 #: error_report.php:45
 msgid ""
@ -2306,17 +2306,17 @@ msgstr "ألقى PHP بالخطأ التالي: %s"
 #: libraries/Advisor.class.php:107
 #, php-format
 msgid "Failed evaluating precondition for rule '%s'."
-msgstr "فشلت في تقييم مسبق للقاعدة '%s'"
+msgstr "فشلت في تقييم مسبق للقاعدة '%s'."

 #: libraries/Advisor.class.php:124
 #, php-format
 msgid "Failed calculating value for rule '%s'."
-msgstr "فشلت في حساب القيمة للقاعدة '%s'"
+msgstr "فشلت في حساب القيمة للقاعدة '%s'."

 #: libraries/Advisor.class.php:143
 #, php-format
 msgid "Failed running test for rule '%s'."
-msgstr "فشلت في تشغيل الإختبار للقاعدة '%s'"
+msgstr "فشلت في تشغيل الإختبار للقاعدة '%s'."

 #: libraries/Advisor.class.php:225
 #, php-format
@ -2328,7 +2328,8 @@ msgstr "فشل تنسيق النص لـ '%s'."
 msgid ""
 "Invalid rule declaration on line %1$s, expected line %2$s of previous rule."
 msgstr ""
-"إعلان قاعدة غير صالح على السطر %1$s، السطر المتوقع هو %2$s من القاعدة السابقة"
+"إعلان قاعدة غير صالح على السطر %1$s، السطر المتوقع هو %2$s من القاعدة "
+"السابقة."

 #: libraries/Advisor.class.php:417
 #, php-format
@ -2967,7 +2968,7 @@ msgstr "لقد تم حذف المفتاح الأساسي"
 #: libraries/Index.class.php:610
 #, php-format
 msgid "Index %s has been dropped."
-msgstr "تم حذف الفهرس %s"
+msgstr "تم حذف الفهرس %s."

 #: libraries/Index.class.php:738
 #, php-format
@ -3140,34 +3141,34 @@ msgstr "خطأ"
 #, php-format
 msgid "%1$d row affected."
 msgid_plural "%1$d rows affected."
-msgstr[0] "%1$d صف تأثر"
-msgstr[1] "%1$d صف تأثر"
-msgstr[2] "%1$d صفوف تأثرت"
-msgstr[3] "%1$d صفوف تأثرت"
-msgstr[4] "%1$d صفوف تأثرت"
-msgstr[5] "%1$d صفوف تأثرت"
+msgstr[0] "%1$d صف تأثر."
+msgstr[1] "%1$d صف تأثر."
+msgstr[2] "%1$d صفوف تأثرت."
+msgstr[3] "%1$d صفوف تأثرت."
+msgstr[4] "%1$d صفوف تأثرت."
+msgstr[5] "%1$d صفوف تأثرت."

 #: libraries/Message.class.php:273
 #, php-format
 msgid "%1$d row deleted."
 msgid_plural "%1$d rows deleted."
-msgstr[0] "%1$d صف حذف"
-msgstr[1] "%1$d صف حذف"
-msgstr[2] "%1$d صفوف حذفت"
-msgstr[3] "%1$d صفوف حذفت"
-msgstr[4] "%1$d صفوف حذفت"
-msgstr[5] "%1$d صفوف حذفت"
+msgstr[0] "%1$d صف حذف."
+msgstr[1] "%1$d صف حذف."
+msgstr[2] "%1$d صفوف حذفت."
+msgstr[3] "%1$d صفوف حذفت."
+msgstr[4] "%1$d صفوف حذفت."
+msgstr[5] "%1$d صفوف حذفت."

 #: libraries/Message.class.php:292
 #, php-format
 msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
-msgstr[0] "%1$d صف أضيف"
-msgstr[1] "%1$d صف أضيف"
-msgstr[2] "%1$d صفوف أضيفت"
-msgstr[3] "%1$d صفوف أضيفت"
-msgstr[4] "%1$d صفوف أضيفت"
-msgstr[5] "%1$d صفوف أضيفت"
+msgstr[0] "%1$d صف أضيف."
+msgstr[1] "%1$d صف أضيف."
+msgstr[2] "%1$d صفوف أضيفت."
+msgstr[3] "%1$d صفوف أضيفت."
+msgstr[4] "%1$d صفوف أضيفت."
+msgstr[5] "%1$d صفوف أضيفت."

 #: libraries/PDF.class.php:70 libraries/Util.class.php:2475
 #: libraries/browse_foreigners.lib.php:393
@ -3925,7 +3926,7 @@ msgstr "إختر مجلد الرفع من الخادم <b>%s</b>:"
 #: libraries/Util.class.php:3376 libraries/insert_edit.lib.php:1234
 #: libraries/sql_query_form.lib.php:487
 msgid "The directory you set for upload work cannot be reached."
-msgstr "لا يمكن الوصول إلى الدليل اللذي عينته لعمل التحميل"
+msgstr "لا يمكن الوصول إلى الدليل اللذي عينته لعمل التحميل."

 #: libraries/Util.class.php:3387
 msgid "There are no files to upload"
@ -4293,7 +4294,7 @@ msgstr "أقصى %s"

 #: libraries/config/FormDisplay.tpl.php:216
 msgid "This setting is disabled, it will not be applied to your configuration."
-msgstr "هذا الإعداد معطل , لن يتم تطبيقه في التكوين"
+msgstr "هذا الإعداد معطل , لن يتم تطبيقه في التكوين."

 #: libraries/config/FormDisplay.tpl.php:308
 #, php-format
@ -8072,7 +8073,7 @@ msgstr ""
 #: libraries/plugins/auth/AuthenticationSignon.class.php:271
 #, php-format
 msgid "No activity within %s seconds; please log in again."
-msgstr "لانشاط منذ %s ثواني , الرجاء تسجيل الدخول من جديد"
+msgstr "لانشاط منذ %s ثواني , الرجاء تسجيل الدخول من جديد."

 #: libraries/plugins/auth/AuthenticationCookie.class.php:691
 #: libraries/plugins/auth/AuthenticationCookie.class.php:693
@ -8096,7 +8097,7 @@ msgstr "الملف %s لايحتوي على أي مفتاح تعريف"
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:185
 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:205
 msgid "Hardware authentication failed!"
-msgstr "فشلت المصادقة المحسوسة"
+msgstr "فشلت المصادقة المحسوسة!"

 #: libraries/plugins/auth/swekey/swekey.auth.lib.php:192
 msgid "No valid authentication key plugged"
--- a/po/be.po
+++ b/po/be.po
@ -4,17 +4,17 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2013-08-23 11:32+0200\n"
+"PO-Revision-Date: 2014-02-27 10:40+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Belarusian <http://l10n.cihar.com/projects/phpmyadmin/master/"
-"be/>\n"
+"Language-Team: Belarusian "
+"<https://l10n.cihar.com/projects/phpmyadmin/4-1/be/>\n"
 "Language: be\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
-"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 1.7-dev\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Weblate 1.9-dev\n"

 #: changelog.php:36 license.php:28
 #, php-format
@ -22,6 +22,8 @@ msgid ""
 "The %s file is not available on this system, please visit www.phpmyadmin.net "
 "for more information."
 msgstr ""
+"Файл %s недаступны на гэтай сістэме, падрабязнасці на сайце "
+"www.phpmyadmin.net."

 #: db_create.php:61
 #, php-format
@ -35,10 +37,9 @@ msgstr "Камэнтар да базы дадзеных: "
 #: db_datadict.php:159 libraries/schema/Pdf_Relation_Schema.class.php:1348
 #: libraries/tbl_columns_definition_form.lib.php:70
 #: libraries/tbl_printview.lib.php:579
-#, fuzzy
 #| msgid "Table comments"
 msgid "Table comments:"
-msgstr "Камэнтар да табліцы"
+msgstr "Камэнтар да табліцы:"

 #: db_datadict.php:168 libraries/Index.class.php:567
 #: libraries/TableSearch.class.php:185 libraries/TableSearch.class.php:1282
@ -59,10 +60,9 @@ msgstr "Камэнтар да табліцы"
 #: libraries/tbl_relation.lib.php:328 libraries/tbl_relation.lib.php:416
 #: libraries/tbl_relation.lib.php:544 libraries/tbl_tracking.lib.php:731
 #: libraries/tbl_tracking.lib.php:818
-#, fuzzy
 #| msgid "Column names"
 msgid "Column"
-msgstr "Назвы калёнак"
+msgstr "Калонка"

 #: db_datadict.php:169 db_printview.php:49 libraries/Index.class.php:564
 #: libraries/TableSearch.class.php:186 libraries/insert_edit.lib.php:243
@ -233,16 +233,14 @@ msgid "Database %1$s has been copied to %2$s"
 msgstr "База дадзеных %s была скапіяваная ў %s"

 #: db_operations.php:260
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| " additional features for working with linked tables have been ctivated. "
 #| "To find out why click %shere%s."
 msgid ""
 "The phpMyAdmin configuration storage has been deactivated. To find out why "
 "click %shere%s."
-msgstr ""
-"Дадатковыя магчымасьці работы з зьвязанымі табліцамі былі адключаныя. Каб "
-"высьветліць чаму, націсьніце %sтут%s."
+msgstr "Сховішча канфігурацыі PHPMyAdmin дэактываванае.  %sДаведацца%s чаму."

 #: db_printview.php:47 db_tracking.php:81 db_tracking.php:208
 #: libraries/Menu.class.php:235 libraries/config/messages.inc.php:519
@ -276,10 +274,9 @@ msgstr "выкарыстоўваецца"

 #: db_printview.php:119 libraries/plugins/export/ExportSql.class.php:1042
 #: libraries/schema/Pdf_Relation_Schema.class.php:1353
-#, fuzzy
 #| msgid "Creation"
 msgid "Creation:"
-msgstr "Створаная"
+msgstr "Створаная:"

 #: db_printview.php:128 libraries/plugins/export/ExportSql.class.php:1055
 #: libraries/schema/Pdf_Relation_Schema.class.php:1358
@ -15050,16 +15047,14 @@ msgid "Your absolute InnoDB log size is %s MiB"
 msgstr ""

 #: libraries/advisory_rules.txt:450
-#, fuzzy
 #| msgid "Buffer pool size"
 msgid "InnoDB buffer pool size"
-msgstr "Памер пулу буфэру"
+msgstr "Памер пулу буфэру InnoDB"

 #: libraries/advisory_rules.txt:453
-#, fuzzy
 #| msgid "Buffer pool size"
 msgid "Your InnoDB buffer pool is fairly small."
-msgstr "Памер пулу буфэру"
+msgstr "Недастатковы памер буферу InnoDB."

 #: libraries/advisory_rules.txt:454
 #, php-format
--- a/po/bg.po
+++ b/po/bg.po
@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-02-20 07:47+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2014-02-25 04:27+0200\n"
+"Last-Translator: Valter Georgiev <blagynchy@gmail.com>\n"
 "Language-Team: Bulgarian "
 "<https://l10n.cihar.com/projects/phpmyadmin/4-1/bg/>\n"
 "Language: bg\n"
@ -10364,7 +10364,7 @@ msgstr "Специфични за колоната права"
 #: libraries/server_privileges.lib.php:2785
 #| msgid "Add privileges on the following database"
 msgid "Add privileges on the following database:"
-msgstr "Добавяне на права"
+msgstr "Добавяне на права върху ДБ"

 #: libraries/server_privileges.lib.php:2812
 msgid "Wildcards % and _ should be escaped with a \\ to use them literally."
--- a/po/bn.po
+++ b/po/bn.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-02-20 07:47+0200\n"
+"PO-Revision-Date: 2014-02-24 07:36+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Bengali <https://l10n.cihar.com/projects/phpmyadmin/4-1/bn/>\n"
 "Language: bn\n"
@ -557,7 +557,7 @@ msgstr "একটি ভিতরের গোলক যোগ কর"
 #, php-format
 #| msgid "Polygon"
 msgid "Polygon %d:"
-msgstr "পলিগন"
+msgstr "পলিগন %d:"

 #: gis_data_editor.php:386 js/messages.php:336
 msgid "Add a polygon"
--- a/po/de.po
+++ b/po/de.po
@ -4,9 +4,9 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-02-03 14:41+0200\n"
-"Last-Translator: Ann + J.M. <phpMyAdmin@ZweiSteinSoft.de>\n"
-"Language-Team: German <http://l10n.cihar.com/projects/phpmyadmin/4-1/de/>\n"
+"PO-Revision-Date: 2014-02-27 11:30+0200\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"Language-Team: German <https://l10n.cihar.com/projects/phpmyadmin/4-1/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -435,7 +435,7 @@ msgstr ""

 #: error_report.php:63 error_report.php:72
 msgid "Thank you for submitting this report."
-msgstr "Danke für die Übermittlung dieses Berichts."
+msgstr "Vielen Dank für das Absenden des Berichtes."

 #: error_report.php:74
 msgid "Unfortunately the submission failed."
--- a/po/es.po
+++ b/po/es.po
@ -4,9 +4,9 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-02-04 00:07+0200\n"
+"PO-Revision-Date: 2014-02-27 18:03+0200\n"
 "Last-Translator: Matías Bellone <matiasbellone+weblate@gmail.com>\n"
-"Language-Team: Spanish <http://l10n.cihar.com/projects/phpmyadmin/4-1/es/>\n"
+"Language-Team: Spanish <https://l10n.cihar.com/projects/phpmyadmin/4-1/es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -4660,7 +4660,7 @@ msgstr "Muestra los servidores en una lista en lugar de un drop down"

 #: libraries/config/messages.inc.php:61
 msgid "Display servers as a list"
-msgstr "Muestra los servidores en una lista"
+msgstr "Mostrar los servidores en una lista"

 #: libraries/config/messages.inc.php:62
 msgid ""
--- a/po/fr.po
+++ b/po/fr.po
@ -4,9 +4,9 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-02-02 10:54+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: French <http://l10n.cihar.com/projects/phpmyadmin/4-1/fr/>\n"
+"PO-Revision-Date: 2014-02-26 21:29+0200\n"
+"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
+"Language-Team: French <https://l10n.cihar.com/projects/phpmyadmin/4-1/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -1061,15 +1061,15 @@ msgstr ""

 #: js/messages.php:81
 msgid "Query cache efficiency"
-msgstr "Efficacité de la cache de requêtes"
+msgstr "Efficacité du cache de requêtes"

 #: js/messages.php:82
 msgid "Query cache usage"
-msgstr "Utilisation de la cache de requêtes"
+msgstr "Utilisation du cache de requêtes"

 #: js/messages.php:83
 msgid "Query cache used"
-msgstr "Cache de requêtes utilisée"
+msgstr "Cache de requêtes utilisé"

 #: js/messages.php:85
 msgid "System CPU Usage"
@ -3262,7 +3262,7 @@ msgstr "Montrer l'état des serveurs esclaves"

 #: libraries/ServerStatusData.class.php:244
 msgid "Flush query cache"
-msgstr "Vider la cache des requêtes"
+msgstr "Vider le cache des requêtes"

 #: libraries/ServerStatusData.class.php:263
 #: libraries/engines/innodb.lib.php:144
--- a/po/hy.po
+++ b/po/hy.po
@ -8,16 +8,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2013-03-30 12:19+0200\n"
-"Last-Translator: Hamlet Muradyan <contact@hamletmuradyan.com>\n"
-"Language-Team: Armenian <http://l10n.cihar.com/projects/phpmyadmin/master/hy/"
-">\n"
+"PO-Revision-Date: 2014-02-27 10:58+0200\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"Language-Team: Armenian <https://l10n.cihar.com/projects/phpmyadmin/4-1/hy/>\n"
 "Language: hy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 1.5-dev\n"
+"X-Generator: Weblate 1.9-dev\n"

 #: changelog.php:36 license.php:28
 #, php-format
@ -11508,7 +11507,7 @@ msgstr ""

 #: libraries/tbl_indexes.lib.php:283
 msgid "Comment:"
-msgstr "Մեկնաբանություն"
+msgstr "Մեկնաբանություն՝"

 #: libraries/tbl_indexes.lib.php:298
 msgid "Index type:"
--- a/po/ia.po
+++ b/po/ia.po
@ -8,10 +8,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-02-10 14:21+0200\n"
+"PO-Revision-Date: 2014-02-26 22:56+0200\n"
 "Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua "
-"<http://l10n.cihar.com/projects/phpmyadmin/4-1/ia/>\n"
+"<https://l10n.cihar.com/projects/phpmyadmin/4-1/ia/>\n"
 "Language: ia\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -5372,6 +5372,10 @@ msgid ""
 "only occurs for the current server. Setting this to FALSE makes it easy to "
 "forget to log out from other servers when connected to multiple servers."
 msgstr ""
+"Si TRUE (ver), le processo de abandonar (logout) remove omne cookies pro "
+"omne le servitores; si FALSE, le processo de logout solmente occurre pro le "
+"servitor currente, Si on fixa isto a FALSE il es facile oblidar de abandonar "
+"(logout) altere servitores quando on connecte a servitores multiple."

 #: libraries/config/messages.inc.php:278
 msgid "Delete all cookies on logout"
@ -5537,6 +5541,8 @@ msgstr "Minime numero de elementos de monstrar in le quadro de filtro"
 #: libraries/config/messages.inc.php:314
 msgid "Minimum number of databases to display the database filter box"
 msgstr ""
+"Le numero minime de base de datos pro monstrar le quadro de filtrar base de "
+"datos"

 #: libraries/config/messages.inc.php:315
 msgid ""
@ -5546,7 +5552,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:316
 msgid "Group items in the tree"
-msgstr ""
+msgstr "Elementos de gruppo in le arbore"

 #: libraries/config/messages.inc.php:317
 msgid "String that separates databases into different tree levels"
@ -5554,7 +5560,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:318
 msgid "Database tree separator"
-msgstr ""
+msgstr "Separator de arbore de base de datos"

 #: libraries/config/messages.inc.php:319
 msgid "String that separates tables into different tree levels"
@ -5562,11 +5568,11 @@ msgstr ""

 #: libraries/config/messages.inc.php:320
 msgid "Table tree separator"
-msgstr ""
+msgstr "Separator de arbore de tabellas"

 #: libraries/config/messages.inc.php:321
 msgid "Maximum table tree depth"
-msgstr ""
+msgstr "Maxime profunditate de arbore de tabellas"

 #: libraries/config/messages.inc.php:322
 msgid "Highlight server under the mouse cursor"
@ -5574,7 +5580,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:323
 msgid "Enable highlighting"
-msgstr ""
+msgstr "Habilita evidentiar"

 #: libraries/config/messages.inc.php:324
 msgid "Maximum number of recently used tables; set 0 to disable"
@ -5582,7 +5588,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:325
 msgid "Recently used tables"
-msgstr ""
+msgstr "Tabellas usate recentemente"

 #: libraries/config/messages.inc.php:326
 msgid "These are Edit, Copy and Delete links"
@ -5590,7 +5596,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:327
 msgid "Where to show the table row links"
-msgstr ""
+msgstr "Ubi monstrar le ligamines de rango de tabellas"

 #: libraries/config/messages.inc.php:328
 msgid "Use natural order for sorting table and database names"
@ -5598,7 +5604,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:329
 msgid "Natural order"
-msgstr ""
+msgstr "Ordine natural"

 #: libraries/config/messages.inc.php:330 libraries/config/messages.inc.php:344
 #: libraries/config/messages.inc.php:346
@ -5625,7 +5631,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:335
 msgid "Default sorting order"
-msgstr ""
+msgstr "Modo de ordinar predefinite"

 #: libraries/config/messages.inc.php:336
 msgid "Use persistent connections to MySQL databases"
@ -5633,7 +5639,7 @@ msgstr ""

 #: libraries/config/messages.inc.php:337
 msgid "Persistent connections"
-msgstr ""
+msgstr "Connexiones persistente"

 #: libraries/config/messages.inc.php:338
 msgid ""
@ -12385,6 +12391,9 @@ msgid ""
 "so a key was automatically generated for you. It is used to encrypt cookies; "
 "you don't need to remember it."
 msgstr ""
+"Tu non habeva fixate le parola clave de blowfish e tu ha habilitate "
+"authentication de cookie, assi un clave ha essite create pro te. Illo es "
+"usate pro cryptar cookie; tu non necessita memorar lo."

 #: setup/lib/index.lib.php:226
 #, php-format
--- a/po/it.po
+++ b/po/it.po
@ -4,9 +4,9 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-01-20 11:22+0200\n"
+"PO-Revision-Date: 2014-02-27 11:31+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Italian <http://l10n.cihar.com/projects/phpmyadmin/4-1/it/>\n"
+"Language-Team: Italian <https://l10n.cihar.com/projects/phpmyadmin/4-1/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -13034,7 +13034,7 @@ msgstr "Relazione FOREIGN KEY aggiunta"

 #: pmd_relation_new.php:84
 msgid "Error: Relational features are disabled!"
-msgstr "Errore: le funzionalità relazionali sono disabilitate!"
+msgstr "Errore: Le funzionalità relazionali sono disabilitate!"

 #: pmd_relation_new.php:100
 msgid "Internal relation added"
--- a/po/ko.po
+++ b/po/ko.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-02-19 16:50+0200\n"
+"PO-Revision-Date: 2014-02-23 05:41+0200\n"
 "Last-Translator: minsung kang <manyfun7@gmail.com>\n"
 "Language-Team: Korean <https://l10n.cihar.com/projects/phpmyadmin/4-1/ko/>\n"
 "Language: ko\n"
@ -5972,10 +5972,9 @@ msgid ""
 msgstr ""

 #: libraries/config/messages.inc.php:438
-#, fuzzy
 #| msgid "Copy column name"
 msgid "Display columns table"
-msgstr "열(컬럼) 이름 복사"
+msgstr "열 목록 표시"

 #: libraries/config/messages.inc.php:439
 msgid ""
@ -6061,32 +6060,27 @@ msgid "User preferences storage table"
 msgstr "사용자 설정 스토리지 테이블"

 #: libraries/config/messages.inc.php:455
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no PDF schema support, suggested: [kbd]pma__pdf_pages[/"
 #| "kbd]"
 msgid ""
 "Leave blank to disable configurable menus feature, suggested: [kbd]pma__users"
 "[/kbd]"
-msgstr ""
-"PDF 스키마를 제공하지 않을 경우 비워두세요. 제안값: [kbd]pma__pdf_pages[/kbd]"
+msgstr "설정을 변경할 수 있는 메뉴를 지정하지 않는 경우 빈칸으로 남겨두십시오. 권장: [kbd]pma__pdf_pages[/kbd]"

 #: libraries/config/messages.inc.php:456
-#, fuzzy
 #| msgid "Use Tables"
 msgid "Users table"
-msgstr "사용할 테이블"
+msgstr "사용자 목록"

 #: libraries/config/messages.inc.php:457
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no PDF schema support, suggested: [kbd]pma__pdf_pages[/"
 #| "kbd]"
 msgid ""
 "Leave blank to disable configurable menus feature, suggested: [kbd]"
 "pma__usergroups[/kbd]"
-msgstr ""
-"PDF 스키마를 제공하지 않을 경우 비워두세요. 제안값: [kbd]pma__pdf_pages[/kbd]"
+msgstr "설정을 변경할 수 있는 메뉴를 지정하지 않는 경우 빈칸으로 남겨두십시오. 권장: [kbd]pma__pdf_pages[/kbd]"

 #: libraries/config/messages.inc.php:458
 #| msgid "Use Tables"
@ -6094,7 +6088,6 @@ msgid "User groups table"
 msgstr "사용자 그룹 테이블"

 #: libraries/config/messages.inc.php:459
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no SQL query tracking support, suggested: [kbd]"
 #| "pma__tracking[/kbd]"
@ -6102,8 +6095,8 @@ msgid ""
 "Leave blank to disable the feature to hide and show navigation items, "
 "suggested: [kbd]pma__navigationhiding[/kbd]"
 msgstr ""
-"SQL 쿼리 추적 기능을 사용하지 않으려면 빈 칸으로 비워두세요. 권장: [kbd]"
-"pma__tracking[/kbd]"
+"네비게이션 항목의 표시 설정을 사용하지 않는 경우 빈칸으로 남겨두십시오. 권장: "
+"[kbd]pma__navigationhiding[/kbd]"

 #: libraries/config/messages.inc.php:460
 msgid "Hidden navigation items table"
--- a/po/ms.po
+++ b/po/ms.po
@ -4,9 +4,9 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-01-03 14:17+0200\n"
+"PO-Revision-Date: 2014-02-27 11:32+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Malay <http://l10n.cihar.com/projects/phpmyadmin/4-1/ms/>\n"
+"Language-Team: Malay <https://l10n.cihar.com/projects/phpmyadmin/4-1/ms/>\n"
 "Language: ms\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -8151,7 +8151,7 @@ msgstr ""

 #: libraries/operations.lib.php:1154 libraries/structure.lib.php:317
 msgid "Analyze table"
-msgstr "Analyze table"
+msgstr ""

 #: libraries/operations.lib.php:1167 libraries/structure.lib.php:314
 msgid "Repair table"
--- a/po/pl.po
+++ b/po/pl.po
@ -4,9 +4,9 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-01-10 09:11+0200\n"
+"PO-Revision-Date: 2014-02-27 11:34+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Polish <http://l10n.cihar.com/projects/phpmyadmin/4-1/pl/>\n"
+"Language-Team: Polish <https://l10n.cihar.com/projects/phpmyadmin/4-1/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -12980,7 +12980,7 @@ msgstr "Relacja FOREIGN KEY została dodana"

 #: pmd_relation_new.php:84
 msgid "Error: Relational features are disabled!"
-msgstr "Błąd: funkcjonalność relacyjna jest wyłączona!"
+msgstr "Błąd: Funkcjonalność relacyjna jest wyłączona!"

 #: pmd_relation_new.php:100
 msgid "Internal relation added"
--- a/po/pt.po
+++ b/po/pt.po
@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-02-04 08:40+0200\n"
-"Last-Translator: Daniel Silva <daniel.p.silva.97@gmail.com>\n"
+"PO-Revision-Date: 2014-02-27 11:34+0200\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Portuguese "
-"<http://l10n.cihar.com/projects/phpmyadmin/4-1/pt/>\n"
+"<https://l10n.cihar.com/projects/phpmyadmin/4-1/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -12790,7 +12790,7 @@ msgstr "Relação FOREIGN KEY adicionada"

 #: pmd_relation_new.php:84
 msgid "Error: Relational features are disabled!"
-msgstr "Erro: as características relacionais estão desactivadas!"
+msgstr "Erro: As características relacionais estão desactivadas!"

 #: pmd_relation_new.php:100
 msgid "Internal relation added"
--- a/po/sl.po
+++ b/po/sl.po
@ -4,9 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-01-19 20:25+0200\n"
+"PO-Revision-Date: 2014-02-22 15:17+0200\n"
 "Last-Translator: Domen <mitenem@outlook.com>\n"
-"Language-Team: Slovenian <http://l10n.cihar.com/projects/phpmyadmin/4-1/sl/>\n"
+"Language-Team: Slovenian "
+"<https://l10n.cihar.com/projects/phpmyadmin/4-1/sl/>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -12772,10 +12773,10 @@ msgid ""
 "level directory as described in [doc@setup_script]documentation[/doc]. "
 "Otherwise you will be only able to download or display it."
 msgstr ""
-"Prosimo, na spletnem strežniku ustvarite zapisljivo mapo [em]config[/em] v "
-"najvišjem nivoju mape phpMyAdmina, kot opisuje [doc@setup_script]"
-"dokumentacija[/doc]. V naprotnem primeru jo boste lahko samo prenesli ali jo "
-"prikazali."
+"Prosimo, da na spletnem strežniku ustvarite zapisljivo mapo [em]config[/em] "
+"v najvišjem nivoju mape phpMyAdmina, kot opisuje "
+"[doc@setup_script]dokumentacija[/doc]. V nasprotnem primeru jo boste lahko "
+"samo prenesli ali jo prikazali."

 #: setup/frames/index.inc.php:68
 msgid ""
@ -12829,7 +12830,7 @@ msgstr "Nov strežnik"

 #: setup/frames/index.inc.php:229
 msgid "Default language"
-msgstr "Privzet jezik"
+msgstr "Privzeti jezik"

 #: setup/frames/index.inc.php:239
 msgid "let the user choose"
@ -12841,7 +12842,7 @@ msgstr "- noben -"

 #: setup/frames/index.inc.php:254
 msgid "Default server"
-msgstr "Privzet strežnik"
+msgstr "Privzeti strežnik"

 #: setup/frames/index.inc.php:266
 msgid "End of line"
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/test/classes/PMA_DbSearch_test.php
+++ b/test/classes/PMA_DbSearch_test.php
@ -153,14 +153,16 @@ class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase
                ),
                true,
                '<tr class="noclick odd"><td>2 matches in <strong>table1</strong>'
-                . '</td><td><a name="browse_search" href="sql.php?db=pma&amp;table'
+                . '</td><td><a name="browse_search" class="ajax" '
+                . 'href="sql.php?db=pma&amp;table'
                . '=table1&amp;goto=db_sql.php&amp;pos=0&amp;is_js_confirmed=0&amp;'
                . 'sql_query=column1&amp;server=0&amp;lang=en&amp;token=token" '
                . 'onclick="loadResult(\'sql.php?db=pma&amp;table=table1&amp;goto='
                . 'db_sql.php&amp;pos=0&amp;is_js_confirmed=0&amp;sql_query=column1'
                . '&amp;server=0&amp;lang=en&amp;token=token\',\'table1\',\'db=pma'
                . '&amp;table=table1&amp;server=0&amp;lang=en&amp;token=token\');'
-                . 'return false;" >Browse</a></td><td><a name="delete_search" href'
+                . 'return false;" >Browse</a></td><td>'
+                . '<a name="delete_search" class="ajax" href'
                . '="sql.php?db=pma&amp;table=table1&amp;goto=db_sql.php&amp;pos=0'
                . '&amp;is_js_confirmed=0&amp;sql_query=column2&amp;server=0&amp;'
                . 'lang=en&amp;token=token" onclick="deleteResult(\'sql.php?db=pma'
@ -225,14 +227,8 @@ class PMA_DbSearch_Test extends PHPUnit_Framework_TestCase
            . '<input type="text" name="criteriaColumnName" size="60"value="" />'
            . '</td></tr></table></fieldset><fieldset class="tblFooters"><input '
            . 'type="submit" name="submit_search" value="Go" id="buttonGo" />'
-            . '</fieldset></form><!-- These two table-image and table-link elements '
-            . 'display the table name in browse search results  --><div id="table-'
-            . 'info"><a class="item" id="table-link" ></a></div><div id="browse-'
-            . 'results"><!-- this browse-results div is used to load the browse and '
-            . 'delete results in the db search --></div><br class="clearfloat" />'
-            . '<div id="sqlqueryform"><!-- this sqlqueryform div is used to load '
-            . 'the delete form in the db search --></div><!--  toggle query box '
-            . 'link--><a id="togglequerybox"></a>',
+            . '</fieldset></form><div id="togglesearchformdiv">'
+            . '<a id="togglesearchformlink"></a></div>',
            $this->object->getSelectionForm($url_params)
        );
    }
--- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
+++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php
@ -1078,18 +1078,14 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
                $this->object->blowfishEncrypt('data123', 'sec321')
            );
        } else {
+            //using our own iv for testing 
+            $tmp = $GLOBALS['iv'];
+            $GLOBALS['iv'] = "testiv09";
            $this->assertEquals(
-                base64_encode(
-                    mcrypt_encrypt(
-                        MCRYPT_BLOWFISH,
-                        'sec321',
-                        'data123',
-                        MCRYPT_MODE_CBC,
-                        $GLOBALS['iv']
-                    )
-                ),
+                'x/2GwHKoPyc=',
                $this->object->blowfishEncrypt('data123', 'sec321')
            );
+            $GLOBALS['iv'] = $tmp;
        }
    }

@ -1101,7 +1097,16 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase
    public function testBlowfishDecrypt()
    {
        if (function_exists('mcrypt_encrypt')) {
-            $this->markTestIncomplete('Not testing mcrypt support');
+            
+             //using our own iv for testing 
+            $tmp = $GLOBALS['iv'];
+            $GLOBALS['iv'] = "testiv09";
+            $this->assertEquals(
+                'data123',
+                $this->object->blowfishDecrypt('x/2GwHKoPyc=', 'sec321')
+            );
+            $GLOBALS['iv'] = $tmp;
+            
        } else {
            $this->assertEquals(
                'data123',