From b5558b21b84a4b02277926b89f0974d63b32de59 Mon Sep 17 00:00:00 2001 From: "J. M" Date: Tue, 11 Sep 2012 14:29:13 +0200 Subject: [PATCH 1/4] Translated using Weblate. --- po/de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/de.po b/po/de.po index dd86aa7638..5eb60e33dd 100644 --- a/po/de.po +++ b/po/de.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin-docs 3.5.1-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-09-06 11:49+0200\n" -"PO-Revision-Date: 2012-09-06 21:15+0200\n" -"Last-Translator: مترجم حرّ \n" +"PO-Revision-Date: 2012-09-11 14:29+0200\n" +"Last-Translator: J. M. \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -9501,7 +9501,7 @@ msgstr "Erstelle eine Datenbank mit gleichem Namen und gewähre alle Rechte" #: server_privileges.php:2223 msgid "Grant all privileges on wildcard name (username\\_%)" msgstr "" -"Gewähre alle Rechte auf Datenbanken die mit dem Benuterznamen beginnen " +"Gewähre alle Rechte auf Datenbanken die mit dem Benutzernamen beginnen " "(username\\_%)" #: server_privileges.php:2227 From e036ddfccadc471ee504aa4e0f213d99c87a5e71 Mon Sep 17 00:00:00 2001 From: Aputsiaq Niels Janussen Date: Sun, 5 Aug 2012 01:39:31 +0200 Subject: [PATCH 2/4] Translated using Weblate. --- po/da.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/da.po b/po/da.po index 70fc19a01a..88eab32e4c 100644 --- a/po/da.po +++ b/po/da.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.3-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2012-09-06 11:49+0200\n" -"PO-Revision-Date: 2012-08-27 11:46+0200\n" -"Last-Translator: Michal Čihař \n" +"PO-Revision-Date: 2012-09-12 23:27+0200\n" +"Last-Translator: Aputsiaq Niels Janussen \n" "Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" @@ -9675,10 +9675,9 @@ msgid "Advisor" msgstr "Rådgiver" #: server_status.php:807 server_status.php:833 -#, fuzzy #| msgid "Number of rows:" msgid "Number of data points: " -msgstr "Antal rækker:" +msgstr "Antal datapunkter:" #: server_status.php:811 server_status.php:837 msgid "Refresh rate: " From 2d34f51bfd1c9ecd2b22b539722cf4dba6662dab Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sat, 15 Sep 2012 23:00:36 +0530 Subject: [PATCH 3/4] We use PMA_ prefix for class names, but not for their file names --- .../import/{PMA_ShapeFile.class.php => ShapeFile.class.php} | 0 .../import/{PMA_ShapeRecord.class.php => ShapeRecord.class.php} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename libraries/plugins/import/{PMA_ShapeFile.class.php => ShapeFile.class.php} (100%) rename libraries/plugins/import/{PMA_ShapeRecord.class.php => ShapeRecord.class.php} (100%) diff --git a/libraries/plugins/import/PMA_ShapeFile.class.php b/libraries/plugins/import/ShapeFile.class.php similarity index 100% rename from libraries/plugins/import/PMA_ShapeFile.class.php rename to libraries/plugins/import/ShapeFile.class.php diff --git a/libraries/plugins/import/PMA_ShapeRecord.class.php b/libraries/plugins/import/ShapeRecord.class.php similarity index 100% rename from libraries/plugins/import/PMA_ShapeRecord.class.php rename to libraries/plugins/import/ShapeRecord.class.php From 7ab1bfc4e6fbf4c11182dc3c04b0c460653a4597 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Sun, 16 Sep 2012 00:00:26 +0530 Subject: [PATCH 4/4] bug #3567684 [edit] Pasting value doesn't clear null checkbox --- ChangeLog | 1 + js/makegrid.js | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index eaaf6cfc47..497f45bdac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -22,6 +22,7 @@ phpMyAdmin - ChangeLog - bug #3562472 add support for Solaris and FreeBSD system load and memory display in server status - bug #3553068 [import] Table import from XML file fails - replace Highcharts with jqplot for Display chart +- bug #3567684 [edit] Pasting value doesn't clear null checkbox 3.5.2.2 (2012-08-12) - [security] Fixed XSS vulnerabilities, see PMASA-2012-4 diff --git a/js/makegrid.js b/js/makegrid.js index cae77e318d..95f84cd14d 100644 --- a/js/makegrid.js +++ b/js/makegrid.js @@ -753,6 +753,12 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi $(g.cEdit).find('.edit_box').live('keypress change', function(e) { $checkbox.attr('checked', false); }); + // Capture ctrl+v (on IE and Chrome) + $(g.cEdit).find('.edit_box').live('keydown', function(e) { + if (e.ctrlKey && e.which == 86) { + $checkbox.prop('checked', false); + } + }); $editArea.find('textarea').live('keydown', function(e) { $checkbox.attr('checked', false); });