From 93e1461e33f6a25cd2091a0832a4fc964f4b221f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?kenan=20akg=C3=BCn?= Date: Fri, 15 Jan 2016 03:20:58 +0100 Subject: [PATCH 1/3] Translated using Weblate (Turkish) Currently translated at 100.0% (3210 of 3210 strings) [CI skip] --- po/tr.po | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/po/tr.po b/po/tr.po index 688b62f1bc..bead234383 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.4-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2016-01-14 09:16+0100\n" -"PO-Revision-Date: 2015-12-17 12:14+0000\n" -"Last-Translator: Burak Yavuz \n" -"Language-Team: Turkish \n" +"PO-Revision-Date: 2016-01-15 03:20+0000\n" +"Last-Translator: kenan akgün \n" +"Language-Team: Turkish " +"\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2596,11 +2596,16 @@ msgid "" "cause such a problem, clearing your \"Offline Website Data\" might help. In " "Safari, such problem is commonly caused by \"Private Mode Browsing\"." msgstr "" +"Sorun tarayıcı depolama, bazı özellikler düzgün çalışmayabilir erişirken bir " +"hata oluştu. Tarayıcı depolama desteklemiyor olması muhtemeldir ya da kota " +"sınırı ulaşıldı. Firefox, bozuk depolama da böyle bir sorun, \"web Sitesi " +"Verilerini\" yardımcı olabilir. Çevrimdışı takas neden olabilir Safari, bu " +"sorun genellikle neden olur \"Özel Tarama Modu\"." #: js/messages.php:635 msgctxt "Previous month" msgid "Prev" -msgstr "Önceki" +msgstr "önceki" #: js/messages.php:640 msgctxt "Next month" @@ -15096,7 +15101,7 @@ msgstr "Tablo ön ekini değiştir" #: templates/database/structure/check_all_tables.phtml:30 msgid "Copy table with prefix" -msgstr "Tabloyu ön eki ile kopyala" +msgstr "Tabloyu ön ek ile kopyala" #: templates/database/structure/check_all_tables.phtml:36 msgid "Add columns to central list" From 61e5d5f47b318a0793b816db01106eb12d4da6e7 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Fri, 15 Jan 2016 10:04:23 +0530 Subject: [PATCH 2/3] Fix #11860 : TypeError: e.handler.apply is not a function Signed-off-by: Atul Pratap Singh --- js/tbl_zoom_plot_jqplot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js index 757275955f..33c5372508 100644 --- a/js/tbl_zoom_plot_jqplot.js +++ b/js/tbl_zoom_plot_jqplot.js @@ -128,7 +128,7 @@ AJAX.registerTeardown('tbl_zoom_plot_jqplot.js', function () { $('#tableid_3').unbind('change'); $('#inputFormSubmitId').unbind('click'); $('#togglesearchformlink').unbind('click'); - $(document).on('keydown', "#dataDisplay :input"); + $(document).off('keydown', "#dataDisplay :input"); $('button.button-reset').unbind('click'); $('div#resizer').unbind('resizestop'); $('div#querychart').unbind('jqplotDataClick'); From d98f57bc5b5fccf67163818c54701059b3732749 Mon Sep 17 00:00:00 2001 From: Deven Bansod Date: Fri, 15 Jan 2016 14:29:46 +0530 Subject: [PATCH 3/3] Fix a typo in condition check Signed-off-by: Deven Bansod --- libraries/check_user_privileges.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/check_user_privileges.lib.php b/libraries/check_user_privileges.lib.php index 8e519e4bff..f1c425ebd0 100644 --- a/libraries/check_user_privileges.lib.php +++ b/libraries/check_user_privileges.lib.php @@ -38,7 +38,7 @@ function PMA_checkRequiredPrivilegesForAdjust( $show_grants_str, "SELECT, INSERT, UPDATE, DELETE" ) !== false) ) { - if ($show_grants_dbname = '*' + if ($show_grants_dbname == '*' && $show_grants_tblname == '*' ) { $GLOBALS['col_priv'] = true;