From eb308e6a1323a389cd93670386e51849c7792d68 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Jun 2011 15:25:10 +0200 Subject: [PATCH 1/5] Translation update done using Pootle. --- po/en_GB.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 32f2201d64..147522b174 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-27 10:29+0200\n" -"PO-Revision-Date: 2011-06-26 13:27+0200\n" +"PO-Revision-Date: 2011-06-27 15:25+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: english-gb \n" "Language: en_GB\n" @@ -4727,10 +4727,9 @@ msgid "Turn it off" msgstr "Turn it off" #: libraries/db_events.inc.php:141 -#, fuzzy #| msgid "Add a new Event" msgid "Add an event" -msgstr "Add a new Event" +msgstr "Add an event" #: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43 #: libraries/db_links.inc.php:44 From 682533fca48249384564d3925824bb8ae0a6b161 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Jun 2011 15:25:20 +0200 Subject: [PATCH 2/5] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 147522b174..0820e431b1 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -5385,10 +5385,9 @@ msgid "Event" msgstr "Event" #: libraries/display_triggers.inc.php:120 -#, fuzzy #| msgid "Add a new Trigger" msgid "Add a trigger" -msgstr "Add a new Trigger" +msgstr "Add a trigger" #: libraries/engines/bdb.lib.php:20 main.php:211 msgid "Version information" From b62b781df2bfc12f51cdaed900f2718478a7f0cc Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Jun 2011 15:25:31 +0200 Subject: [PATCH 3/5] Translation update done using Pootle. --- po/en_GB.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/en_GB.po b/po/en_GB.po index 0820e431b1..2b883de1fa 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -7150,10 +7150,9 @@ msgid "PARTITION definition" msgstr "PARTITION definition" #: libraries/tbl_properties.inc.php:776 -#, fuzzy #| msgid "+ Add a new value" msgid "+ Add a value" -msgstr "+ Add a new value" +msgstr "+ Add a value" #: libraries/transformations/application_octetstream__download.inc.php:9 msgid "" From e9c3e1dc33bc58e683548883978472074d13c0d9 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Mon, 27 Jun 2011 15:26:01 +0200 Subject: [PATCH 4/5] Translation update done using Pootle. --- po/fr.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/po/fr.po b/po/fr.po index a64cc2096e..16cbae37b8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 3.5.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2011-06-27 10:29+0200\n" -"PO-Revision-Date: 2011-06-26 13:35+0200\n" +"PO-Revision-Date: 2011-06-27 15:26+0200\n" "Last-Translator: Marc Delisle \n" "Language-Team: french \n" "Language: fr\n" @@ -7232,7 +7232,6 @@ msgid "PARTITION definition" msgstr "Définition de PARTITION" #: libraries/tbl_properties.inc.php:776 -#, fuzzy #| msgid "+ Add a new value" msgid "+ Add a value" msgstr "+ Ajouter une valeur" From 9fc6e35cfd1d8270d943f5577807a3c79f5c6168 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 27 Jun 2011 16:09:22 +0200 Subject: [PATCH 5/5] Avoid double escaping --- tbl_structure.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tbl_structure.php b/tbl_structure.php index 077dbcf495..7d380b4197 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -252,7 +252,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) { // for the case ENUM('–','“') $type = htmlspecialchars($type); if(strlen($type) > $GLOBALS['cfg']['LimitChars']) { - $type = '' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . ''; + $type = '' . substr($type, 0, $GLOBALS['cfg']['LimitChars']) . ''; } $type_nowrap = '';