From d833b401a8a258fc63ef696a5d689a3bc22c7b83 Mon Sep 17 00:00:00 2001 From: sand wedge Date: Fri, 3 Jan 2014 21:27:01 +0100 Subject: [PATCH 1/2] Translated using Weblate (Kazakh) Currently translated at 12.9% (355 of 2749) --- po/kk.po | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/po/kk.po b/po/kk.po index 1e20b1b335..453f83d2cb 100644 --- a/po/kk.po +++ b/po/kk.po @@ -8,8 +8,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: 2014-01-03 21:11+0200\n" -"Last-Translator: Berikbol Zharylkassyn \n" +"PO-Revision-Date: 2014-01-03 21:26+0200\n" +"Last-Translator: sand wedge \n" "Language-Team: Kazakh \n" "Language: kk\n" "MIME-Version: 1.0\n" @@ -39,7 +39,6 @@ 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 "Кестеге түсініктеме:" @@ -273,24 +272,21 @@ msgstr "қолданыста" #: db_printview.php:117 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:126 libraries/plugins/export/ExportSql.class.php:1055 #: libraries/schema/Pdf_Relation_Schema.class.php:1358 -#, fuzzy #| msgid "Last update" msgid "Last update:" -msgstr "Соңғы жаңартылым" +msgstr "Соңғы жаңарту:" #: db_printview.php:135 libraries/plugins/export/ExportSql.class.php:1068 #: libraries/schema/Pdf_Relation_Schema.class.php:1363 -#, fuzzy #| msgid "Last check" msgid "Last check:" -msgstr "Соңғы тексерім" +msgstr "Соңғы тексеріс:" #: db_printview.php:149 libraries/structure.lib.php:176 #, php-format @@ -423,25 +419,30 @@ msgid "" "An error has been detected and an error report has been automatically " "submitted based on your settings." 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 "" "An error has been detected and an error report has been generated but failed " "to be sent." msgstr "" +"Қателік анықталды және қателік баяндамасы құрылды, бірақ жіберілмей қалды." #: error_report.php:50 error_report.php:77 msgid "If you experience any problems please submit a bug report manually." msgstr "" +"Егер сізде қандай да бір мәселелер туындаса қателік баяндамасын өзіңіз " +"жолдаңыз." #: error_report.php:63 error_report.php:72 msgid "Thank you for submitting this report." -msgstr "" +msgstr "Баяндаманы жолдағаныңыз үшін рахмет." #: error_report.php:74 msgid "Unfortunately the submission failed." @@ -562,10 +563,10 @@ msgid "Add an inner ring" msgstr "" #: gis_data_editor.php:327 -#, fuzzy, php-format +#, php-format #| msgid "Polygon" msgid "Polygon %d:" -msgstr "Көпбұрыш" +msgstr "%d көпбұрышы:" #: gis_data_editor.php:386 js/messages.php:335 msgid "Add a polygon" From 7b8dff255057843eff142d5d3cd947c07b9da6f2 Mon Sep 17 00:00:00 2001 From: Atul Pratap Singh Date: Sat, 4 Jan 2014 16:58:22 +0530 Subject: [PATCH 2/2] [Backporting to QA_4_1 from master] Turn off user select while rearranging columns Signed-off-by: Atul Pratap Singh --- js/makegrid.js | 2 ++ themes/pmahomme/css/common.css.php | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/js/makegrid.js b/js/makegrid.js index ad5b6935ee..93c175d2a8 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -1448,6 +1448,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi // register events $(t).find('th.draggable') .mousedown(function (e) { + $('#sqlqueryresults').addClass("turnOffSelect"); if (g.visibleHeadersCount > 1) { g.dragStartReorder(e, this); } @@ -1846,6 +1847,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi g.dragMove(e); }); $(document).mouseup(function (e) { + $('#sqlqueryresults').removeClass("turnOffSelect"); g.dragEnd(e); }); } diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index 030369cb69..23a0d034de 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -2613,6 +2613,13 @@ fieldset .disabled-field td { background: #DDD; } +.turnOffSelect { + -moz-user-select: none; + -khtml-user-select: none; + -webkit-user-select: none; + user-select: none; +} + #page_content { background-color: white; }