From a7703a36441f764f7cdadc0a1b9ee74b477df546 Mon Sep 17 00:00:00 2001 From: Panagiotis Papazoglou Date: Sat, 14 Jun 2014 10:00:21 +0200 Subject: [PATCH 1/3] Translated using Weblate (Greek) Currently translated at 100.0% (2770 of 2770) --- po/el.po | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/po/el.po b/po/el.po index b78b59073c..158f71a674 100644 --- a/po/el.po +++ b/po/el.po @@ -4,15 +4,15 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.2.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-06-10 12:45-0400\n" -"PO-Revision-Date: 2014-05-25 08:23+0200\n" +"PO-Revision-Date: 2014-06-14 10:00+0200\n" "Last-Translator: Panagiotis Papazoglou \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 1.9-dev\n" +"X-Generator: Weblate 1.10-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -5065,10 +5065,9 @@ msgid "Add %s" msgstr "Προσθήκη %s" #: libraries/config/messages.inc.php:178 -#, fuzzy #| msgid "Use hexadecimal for BLOB" msgid "Use hexadecimal for BINARY & BLOB" -msgstr "Χρήση δεκαεξαδικού για τον BLOB" +msgstr "Χρήση δεκαεξαδικού για BINARY και BLOB" #: libraries/config/messages.inc.php:180 msgid "Use ignore inserts" From 47709d414ef88a5ff63c0069c23e9d8b427bb68e Mon Sep 17 00:00:00 2001 From: Christian Simon Date: Fri, 13 Jun 2014 17:25:43 +0200 Subject: [PATCH 2/3] Fix 'token mismatch' due to missing server parameter for some AJAX requests * server_privileges user duplicate request * js error_reporting * cf. https://sourceforge.net/p/phpmyadmin/bugs/3893 Signed-off-by: Christian Simon Signed-off-by: Marc Delisle --- js/error_report.js | 1 + js/server_privileges.js | 1 + 2 files changed, 2 insertions(+) diff --git a/js/error_report.js b/js/error_report.js index c52dc7bbda..8e80cccf19 100644 --- a/js/error_report.js +++ b/js/error_report.js @@ -21,6 +21,7 @@ var ErrorReport = { ErrorReport._last_exception = exception; $.get("error_report.php", { ajax_request: true, + server: PMA_commonParams.get('server'), token: PMA_commonParams.get('token'), get_settings: true }, function (data) { diff --git a/js/server_privileges.js b/js/server_privileges.js index 1016a803c9..c77cc521c7 100644 --- a/js/server_privileges.js +++ b/js/server_privileges.js @@ -193,6 +193,7 @@ AJAX.registerOnload('server_privileges.js', function () { var params = { 'ajax_request' : true, 'token' : PMA_commonParams.get('token'), + 'server' : PMA_commonParams.get('server'), 'validate_username' : true, 'username' : username }; From a33fcad037f58ddddb9714f186f12b49753062be Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sat, 14 Jun 2014 09:19:56 -0400 Subject: [PATCH 3/3] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index 01a6693fad..4bc3771e43 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,7 @@ phpMyAdmin - ChangeLog - Regenerate cookie encryption IV for every session - bug #4405 Cannot import (open_basedir): fix another case - bug #4457 SQL tab - Insert queries not showing affected row count +- bug Missing warning about existing account, on multi-server config 4.2.3.0 (2014-06-08) - bug #4423 Moving fields not working