Merge remote-tracking branch 'origin/QA_3_5' into QA_3_5

ChangeLog

@@ -6,10 +6,11 @@ phpMyAdmin - ChangeLog
 - bug #3585523 [interface] Inline query editing broken after row update
 - bug #3586389 [setup] Cannot switch language in /setup
 - bug #3585695 [CSS] Font size in inline query editor is way too big
+- bug #3588354 [l10n] Portuguese Language not displaying correctly
 
 3.5.4.0 (2012-11-16)
 - bug #3570212 [edit] uuid_short() is a no-arguments function
-- bug #3569577 [edit] Add routine parameter headers not valid for "function" 
+- bug #3569577 [edit] Add routine parameter headers not valid for "function"
 - bug #3575799 [search] Various search operators not working as expected
 - bug #3576322 [search] Invalid select query generated for tables with ENUM fields
 - bug #3577468 [display] Incorrect imagejpeg Syntax Breaks Image Transformation
@@ -37,7 +38,7 @@ phpMyAdmin - ChangeLog
 - bug #3559955 [edit] current_date from function drop down fails on update
 - 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 
+- replace Highcharts with jqplot for Display chart
 - bug #3567684 [edit] Pasting value doesn't clear null checkbox
 - bug #3570786 [edit] Datepicker for date and datetime fields is broken