Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

10 files changed, 77 insertions, 102 deletions

diff --git a/ChangeLog b/ChangeLog
index be73faacbe..6eb16fb75e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -81,6 +81,8 @@ phpMyAdmin - ChangeLog
 - bug #4984 Undefined <feature>work upon upgrade to new version
 
 4.4.13.0 (not yet released)
+- issue #1808 "Improve table structure" generates invalid SQL
+- bug         Once checked "Show only active" checkbox is always checked
 
 4.4.12.0 (2015-07-20)
 - bug       Saved chart image does not have a proper name or an extension
diff --git a/js/ajax.js b/js/ajax.js
index a5a70f91a7..13e388a58c 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -446,10 +446,12 @@ var AJAX = {
                         .insertAfter('#selflink')
                         .append(data._errors);
                     // bind for php error reporting forms (bottom)
-                    $("#pma_ignore_errors_bottom").bind("click", function() {
+                    $("#pma_ignore_errors_bottom").bind("click", function(e) {
+                        e.preventDefault();
                         PMA_ignorePhpErrors();
                     });
-                    $("#pma_ignore_all_errors_bottom").bind("click", function() {
+                    $("#pma_ignore_all_errors_bottom").bind("click", function(e) {
+                        e.preventDefault();
                         PMA_ignorePhpErrors(false);
                     });
                     // In case of 'sendErrorReport'='always'
diff --git a/js/messages.php b/js/messages.php
index d43376ebc3..917e6d6650 100644
--- a/js/messages.php
+++ b/js/messages.php
@@ -572,14 +572,15 @@ $js_messages['strTooManyInputs'] = __(
 
 $js_messages['phpErrorsFound'] = '<div class="error">'
     . __('Some errors have been detected on the server!')
-    . '<div>'
+    . '<br/>'
     . __('Please look at the bottom of this window.')
+    . '<div>'
     . '<input id="pma_ignore_errors_popup" type="submit" value="'
     . __('Ignore')
-    . '" style="float: right; margin: 20px;">'
+    . '" class="floatright" style="margin-top: 20px;">'
     . '<input id="pma_ignore_all_errors_popup" type="submit" value="'
     . __('Ignore All')
-    . '" style="float: right; margin: 20px;">'
+    . '" class="floatright" style="margin-top: 20px;">'
     . '</div></div>';
 
 $js_messages['phpErrorsBeingSubmitted'] = '<div class="error">'
diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php
index 3a4c028b4e..d8518a2d7a 100644
--- a/libraries/Error_Handler.class.php
+++ b/libraries/Error_Handler.class.php
@@ -331,25 +331,23 @@ class PMA_Error_Handler
                     . '<input type="hidden" name="send_error_report" value="1" />'
                     . '<input type="submit" value="'
                     . __('Report')
-                    . '" id="pma_report_errors" style="float: right; margin: 20px;">'
+                    . '" id="pma_report_errors" class="floatright">'
                     . '<input type="checkbox" name="always_send"'
                     . ' id="always_send_checkbox" value="true"/>'
                     . '<label for="always_send_checkbox">'
                     . __('Automatically send report next time')
-                    . '</label>'
-                    . '</form>';
+                    . '</label>';
 
             if ($GLOBALS['cfg']['SendErrorReports'] == 'ask') {
                 // add ignore buttons
                 $retval .= '<input type="submit" value="'
                         . __('Ignore')
-                        . '" id="pma_ignore_errors_bottom"'
-                        . ' style="float: right; margin: 20px;">';
+                        . '" id="pma_ignore_errors_bottom" class="floatright">';
             }
             $retval .= '<input type="submit" value="'
                     . __('Ignore All')
-                    . '" id="pma_ignore_all_errors_bottom"'
-                    . ' style="float: right; margin: 20px;">';
+                    . '" id="pma_ignore_all_errors_bottom" class="floatright">';
+            $retval .= '</form>';
         }
         return $retval;
     }
@@ -537,11 +535,13 @@ class PMA_Error_Handler
                             function() {
                                 PMA_ignorePhpErrors(false)
                             });'
-                        . '$("#pma_ignore_errors_bottom").bind("click", function() {
+                        . '$("#pma_ignore_errors_bottom").bind("click", function(e) {
+                            e.preventDefaulut();
                             PMA_ignorePhpErrors()
                         });'
                         . '$("#pma_ignore_all_errors_bottom").bind("click",
-                            function() {
+                            function(e) {
+                                e.preventDefault();
                                 PMA_ignorePhpErrors(false)
                             });'
                         . '$("html, body").animate({
diff --git a/libraries/create_addfield.lib.php b/libraries/create_addfield.lib.php
index 68e578cec3..afeaa29b76 100644
--- a/libraries/create_addfield.lib.php
+++ b/libraries/create_addfield.lib.php
@@ -106,6 +106,10 @@ function PMA_setColumnCreationStatementSuffix($current_field_num,
         return $sql_suffix;
     }
 
+    if ($_REQUEST['field_where'] == 'last') {
+        return $sql_suffix;
+    }
+
     // Only the first field can be added somewhere other than at the end
     if ($current_field_num == 0) {
         if ($_REQUEST['field_where'] == 'first') {
diff --git a/libraries/server_status_processes.lib.php b/libraries/server_status_processes.lib.php
index 7b70a94218..d3708635eb 100644
--- a/libraries/server_status_processes.lib.php
+++ b/libraries/server_status_processes.lib.php
@@ -244,7 +244,6 @@ function PMA_getHtmlForProcessListFilter()
     }
 
     $url_params = array(
-        'showExecuting' => 1,
         'ajax_request' => true
     );
 
diff --git a/po/it.po b/po/it.po
index 17b9bfdec6..4e94a9e38e 100644
--- a/po/it.po
+++ b/po/it.po
@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-07-20 06:34-0400\n"
-"PO-Revision-Date: 2015-07-14 16:13+0200\n"
+"PO-Revision-Date: 2015-07-21 20:10+0200\n"
 "Last-Translator: Stefano Martinelli <stefano.ste.martinelli@gmail.com>\n"
-"Language-Team: Italian <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/it/>\n"
+"Language-Team: Italian "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/it/>\n"
 "Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -5677,12 +5677,13 @@ msgid ""
 "Find any errors in the query before executing it. Requires CodeMirror to be "
 "enabled."
 msgstr ""
+"Trova gli errori nella query prima di eseguirla. Richiede CodeMirror per "
+"essere abilitato."
 
 #: libraries/config/messages.inc.php:62
-#, fuzzy
 #| msgid "Enable SQL Validator"
 msgid "Enable linter"
-msgstr "Abilita il validatore SQL"
+msgstr "Abilita linter"
 
 #: libraries/config/messages.inc.php:64
 msgid ""
@@ -12509,19 +12510,17 @@ msgstr ""
 "con un nome host (hostname) diverso."
 
 #: libraries/server_privileges.lib.php:1503
-#, fuzzy
 #| msgid "User name:"
 msgid "Host name:"
-msgstr "Nome utente:"
+msgstr "Nome host:"
 
 #: libraries/server_privileges.lib.php:1508
 #: libraries/server_privileges.lib.php:1610
 #: libraries/server_privileges.lib.php:2242
 #: libraries/server_privileges.lib.php:3203
-#, fuzzy
 #| msgid "Log name"
 msgid "Host name"
-msgstr "Nome del log"
+msgstr "Nome host"
 
 #: libraries/server_privileges.lib.php:1645
 msgid "Do not change the password"
@@ -14880,10 +14879,9 @@ msgid "Pick from Central Columns"
 msgstr "Scegli dai Campi Centrali"
 
 #: templates/columns_definitions/column_virtuality.phtml:46
-#, fuzzy
 #| msgid "Compression"
 msgid "Expression"
-msgstr "Compressione"
+msgstr "Espressione"
 
 #: templates/columns_definitions/move_column.phtml:7
 msgid "first"
@@ -14911,7 +14909,7 @@ msgstr ""
 
 #: templates/columns_definitions/table_fields_definitions.phtml:70
 msgid "Virtuality"
-msgstr ""
+msgstr "Virtuality"
 
 #: templates/columns_definitions/table_fields_definitions.phtml:76
 msgid "Move column"
diff --git a/po/ko.po b/po/ko.po
index 3fa8f77f58..535033cc7e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-07-20 06:34-0400\n"
-"PO-Revision-Date: 2015-03-30 03:03+0200\n"
-"Last-Translator: Kyeong Su Shin <cdac1234@gmail.com>\n"
-"Language-Team: Korean <https://hosted.weblate.org/projects/phpmyadmin/master/"
-"ko/>\n"
+"PO-Revision-Date: 2015-07-22 08:21+0200\n"
+"Last-Translator: Koo Youngmin <youngminz.kr@gmail.com>\n"
+"Language-Team: Korean "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/ko/>\n"
 "Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.4-dev\n"
 
 #: changelog.php:37 license.php:28
 #, php-format
@@ -678,16 +678,14 @@ msgid "Import has been successfully finished, %d queries executed."
 msgstr "가져오기를 성공적으로 마쳤습니다. %d 쿼리가 실행되었습니다."
 
 #: import.php:692
-#, fuzzy, php-format
+#, php-format
 #| msgid ""
 #| "Script timeout passed, if you want to finish import, please resubmit same "
 #| "file and import will resume."
 msgid ""
 "Script timeout passed, if you want to finish import, please %sresubmit the "
 "same file%s and import will resume."
-msgstr ""
-"스크립트 타임아웃이 통보되었습니다. 가져오기를 이어서 계속 완료시키려면 같은 "
-"파일을 다시 전송해주십시오."
+msgstr "스크립트 시간 제한이 초과되었습니다. 이어서 하시려면 같은 파일을 다시 전송해 주세요 (%s, %s)."
 
 #: import.php:702
 msgid ""
@@ -699,7 +697,7 @@ msgstr ""
 
 #: import_status.php:103
 msgid "Could not load the progress of the import."
-msgstr ""
+msgstr "가져오기에 필요한 절차를 로드할 수 없습니다."
 
 #: import_status.php:112 js/messages.php:378 libraries/Util.class.php:776
 #: libraries/export.lib.php:515
@@ -826,7 +824,6 @@ msgid "List of changes"
 msgstr "변경 목록"
 
 #: index.php:451
-#, fuzzy
 #| msgid ""
 #| "Your configuration file contains settings (root with no password) that "
 #| "correspond to the default MySQL privileged account. Your MySQL server is "
@@ -838,9 +835,8 @@ msgid ""
 "default, is open to intrusion, and you really should fix this security hole "
 "by setting a password for user 'root'."
 msgstr ""
-"환경설정파일에 MySQL 관리자 암호가 없습니다. 이같은 기본설정상태로 MySQL 서버"
-"가 작동한다면 누구나 침입할 수 있으므로, 'root'유저에 암호를 설정하여 이 보"
-"안 취약점을 수정하시기 바랍니다."
+"비밀번호 없이 MySQL의 최고 권한을 가지고 있는 root 유저로 로그인했습니다. MySQL 서버는 외부의 해킹에 대해 취약한 기본 "
+"설정으로 돌아가고 있으며, 설정에서 root 유저의 비밀번호를 설정하는 것으로 이 취약점을 최대한 빨리 고쳐야 합니다."
 
 #: index.php:468
 msgid ""
diff --git a/po/si.po b/po/si.po
index 57be0ea563..b9b5fc61c2 100644
--- a/po/si.po
+++ b/po/si.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-07-20 06:34-0400\n"
-"PO-Revision-Date: 2015-07-20 18:30+0200\n"
+"PO-Revision-Date: 2015-07-22 07:21+0200\n"
 "Last-Translator: Madhura Jayaratne <madhura.cj@gmail.com>\n"
 "Language-Team: Sinhala "
 "<https://hosted.weblate.org/projects/phpmyadmin/master/si/>\n"
@@ -1885,10 +1885,9 @@ msgid "Changing Charset"
 msgstr "අක්ෂර කට්ටලය වෙනස් කෙරෙමින්"
 
 #: js/messages.php:320 libraries/Util.class.php:3220
-#, fuzzy
 #| msgid "Disable foreign key checks"
 msgid "Enable foreign key checks"
-msgstr "අන්‍ය මූල පරීක්ෂා අක්‍රිය කරන්න"
+msgstr "අන්‍ය මූල පරීක්ෂා සක්‍රිය කරන්න"
 
 #: js/messages.php:323
 #, fuzzy
@@ -3545,17 +3544,16 @@ msgstr "තීර:"
 
 #: libraries/DBQbe.class.php:513
 msgid "Alias:"
-msgstr ""
+msgstr "අන්වර්ථය:"
 
 #: libraries/DBQbe.class.php:566
 msgid "Sort:"
 msgstr "සුබෙදන්න:"
 
 #: libraries/DBQbe.class.php:630
-#, fuzzy
 #| msgid "Sort:"
 msgid "Sort order:"
-msgstr "සුබෙදන්න:"
+msgstr "සුබෙදුම් අනුපිළිවෙල:"
 
 #: libraries/DBQbe.class.php:679
 msgid "Show:"
@@ -4215,10 +4213,9 @@ msgstr "සැලසුම්කරණය"
 
 #: libraries/Menu.class.php:505 libraries/Util.class.php:4367
 #: libraries/structure.lib.php:360
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Central columns"
-msgstr "පෙළ පෙදෙසේ පළල"
+msgstr "මධ්‍යම තීර"
 
 #: libraries/Menu.class.php:542 libraries/Util.class.php:4339
 #: libraries/config.values.php:103 libraries/config/messages.inc.php:248
@@ -4229,10 +4226,9 @@ msgid "Databases"
 msgstr "දත්තගබඩා"
 
 #: libraries/Menu.class.php:566
-#, fuzzy
 #| msgid "Users"
 msgid "User accounts"
-msgstr "භාවිතා කරන්නන්"
+msgstr "භාවිත ගිණුම්"
 
 #: libraries/Menu.class.php:593 libraries/ServerStatusData.class.php:121
 #: libraries/Util.class.php:4346 libraries/server_common.lib.php:36
@@ -7200,10 +7196,9 @@ msgid "Default sort order for tables with a primary key."
 msgstr ""
 
 #: libraries/config/messages.inc.php:572
-#, fuzzy
 #| msgid "Default sorting order"
 msgid "Primary key default sort order"
-msgstr "පෙරනිමි අනුපිළිවෙල"
+msgstr "ප්‍රාථමික යතුරු පෙරනිමි සුබෙදුම් අනුපිළිවෙල"
 
 #: libraries/config/messages.inc.php:574
 #, fuzzy
@@ -7504,10 +7499,9 @@ msgstr ""
 "[kbd]pma__pdf_pages[/kbd]"
 
 #: libraries/config/messages.inc.php:658
-#, fuzzy
 #| msgid "Exporting rows from \"%s\" table"
 msgid "Export templates table"
-msgstr "\"%s\" වගුවෙන් පේළි අපනයනය කිරීම"
+msgstr "අපනයන ආකෘති වගුව"
 
 #: libraries/config/messages.inc.php:660
 #, fuzzy
@@ -8525,16 +8519,14 @@ msgid "Exporting rows from \"%s\" table"
 msgstr "\"%s\" වගුවෙන් පේළි අපනයනය කිරීම"
 
 #: libraries/display_export.lib.php:203
-#, fuzzy
 #| msgid "Export type"
 msgid "Export templates:"
-msgstr "අපනයන වර්ගය"
+msgstr "අපනයන ආකෘති:"
 
 #: libraries/display_export.lib.php:208
-#, fuzzy
 #| msgid "File name template:"
 msgid "New template:"
-msgstr "ගොනු නාම අච්චුව:"
+msgstr "නව ආකෘතිය:"
 
 #: libraries/display_export.lib.php:211
 #, fuzzy
@@ -8543,23 +8535,20 @@ msgid "Template name"
 msgstr "වගුවේ නම"
 
 #: libraries/display_export.lib.php:220
-#, fuzzy
 #| msgid "File name template:"
 msgid "Existing templates:"
-msgstr "ගොනු නාම අච්චුව:"
+msgstr "පවත්නා ආකෘති:"
 
 #: libraries/display_export.lib.php:221
-#, fuzzy
 #| msgid "%s table"
 #| msgid_plural "%s tables"
 msgid "Template:"
-msgstr "%s වගු"
+msgstr "ආකෘතිය:"
 
 #: libraries/display_export.lib.php:226
-#, fuzzy
 #| msgid "Updated"
 msgid "Update"
-msgstr "යාවත්කාලීන කරන ලදි"
+msgstr "යාවත්කාලීන කරන්න"
 
 #: libraries/display_export.lib.php:248
 #, fuzzy
@@ -9554,7 +9543,7 @@ msgstr "රුමේනියානු"
 
 #: libraries/mysql_charsets.lib.php:243
 msgid "Sinhalese"
-msgstr ""
+msgstr "සිංහල"
 
 #: libraries/mysql_charsets.lib.php:246
 msgid "Slovak"
@@ -9599,10 +9588,9 @@ msgid "multilingual"
 msgstr "බහුභාෂා"
 
 #: libraries/mysql_charsets.lib.php:273
-#, fuzzy
 #| msgid "File name"
 msgid "Vietnamese"
-msgstr "ගොනුවේ නම"
+msgstr "වියට්නාම්"
 
 #: libraries/mysql_charsets.lib.php:300
 msgid "Central European"
@@ -10160,10 +10148,9 @@ msgstr ""
 #: libraries/operations.lib.php:867 libraries/operations.lib.php:961
 #: libraries/operations.lib.php:1315 libraries/rte/rte_routines.lib.php:907
 #: templates/columns_definitions/table_fields_definitions.phtml:47
-#, fuzzy
 #| msgid "Edit Privileges"
 msgid "Adjust Privileges"
-msgstr "වරප්‍රසාද සංස්කරණය කරන්න"
+msgstr "වරප්‍රසාද හැඩ ගස්වන්න"
 
 #: libraries/operations.lib.php:133
 #, php-format
@@ -11578,10 +11565,9 @@ msgid "Remembering Designer Settings"
 msgstr "වගුව සැකසූ අනුපිළිවෙල මතක තබාගන්න"
 
 #: libraries/relation.lib.php:338
-#, fuzzy
 #| msgid "Invalid export type"
 msgid "Saving export templates"
-msgstr "වැරදි අපනයන වර්ගයකි"
+msgstr "අපනයන ආකෘති සුරකිමින්"
 
 #: libraries/relation.lib.php:346
 msgid "Quick steps to setup advanced features:"
@@ -12776,19 +12762,17 @@ msgid ""
 msgstr ""
 
 #: libraries/server_privileges.lib.php:1503
-#, fuzzy
 #| msgid "User name:"
 msgid "Host name:"
-msgstr "භාවිත නාමය:"
+msgstr "දාරක නාමය:"
 
 #: libraries/server_privileges.lib.php:1508
 #: libraries/server_privileges.lib.php:1610
 #: libraries/server_privileges.lib.php:2242
 #: libraries/server_privileges.lib.php:3203
-#, fuzzy
 #| msgid "Log name"
 msgid "Host name"
-msgstr "ලොග් නම"
+msgstr "දාරක නාමය"
 
 #: libraries/server_privileges.lib.php:1645
 msgid "Do not change the password"
@@ -12806,16 +12790,14 @@ msgstr "ඔබ %s සඳහා වරප්‍රසාද අහෝසි ක�
 
 #: libraries/server_privileges.lib.php:1933
 #: libraries/server_privileges.lib.php:4063
-#, fuzzy
 #| msgid "Add user"
 msgid "Add user account"
-msgstr "භාවිතා කරන්නෙක් එක් කරන්න"
+msgstr "භාවිත ගිණුමක් එක් කරන්න"
 
 #: libraries/server_privileges.lib.php:1942
-#, fuzzy
 #| msgid "Database for user"
 msgid "Database for user account"
-msgstr "භාවිතා කරන්නා සඳහා දත්තගබඩාව"
+msgstr "භාවිත ගිණුම සඳහා දත්තගබඩාව"
 
 #: libraries/server_privileges.lib.php:1946
 msgid "Create database with same name and grant all privileges."
@@ -12912,16 +12894,14 @@ msgid ""
 msgstr "… භාවිතා කරන්නන්ගේ වගුවෙන් පැරණි එක ඉවත් කර වරප්‍රසාද නැවත අලුත් කරන්න."
 
 #: libraries/server_privileges.lib.php:2728
-#, fuzzy
 #| msgid "Change Login Information / Copy User"
 msgid "Change login information / Copy user account"
-msgstr "ලොගින් තොරතුරු වෙනස් කරන්න / භාවිතා කරන්නා පිටපත් කරන්න"
+msgstr "ලොගින් තොරතුරු වෙනස් කරන්න / භාවිත ගිණුම පිටපත් කරන්න"
 
 #: libraries/server_privileges.lib.php:2734
-#, fuzzy
 #| msgid "Create a new user with the same privileges and …"
 msgid "Create a new user account with the same privileges and …"
-msgstr "සහ එකම වරප්‍රසාද සහිතව නව භාවිතා කරන්නෙක් එක් කරන්න …"
+msgstr "සහ එකම වරප්‍රසාද සහිතව නව භාවිත ගිණුමක් එක් කරන්න …"
 
 #: libraries/server_privileges.lib.php:3036
 msgid "Column-specific privileges"
@@ -12942,10 +12922,9 @@ msgid "Add privileges on the following table:"
 msgstr "පහත වගුවට වරප්‍රසාද එක් කරන්න:"
 
 #: libraries/server_privileges.lib.php:3370
-#, fuzzy
 #| msgid "Remove selected users"
 msgid "Remove selected user accounts"
-msgstr "තෝරාගත් භාවිතා කරන්නන් ඉවත් කරන්න"
+msgstr "තෝරාගත් භාවිත ගිණුම් ඉවත් කරන්න"
 
 #: libraries/server_privileges.lib.php:3376
 msgid "Revoke all active privileges from the users and delete them afterwards."
@@ -13011,10 +12990,9 @@ msgid "Edit privileges:"
 msgstr "වරප්‍රසාද සංස්කරණය කරන්න:"
 
 #: libraries/server_privileges.lib.php:4085
-#, fuzzy
 #| msgid "Users"
 msgid "User account"
-msgstr "භාවිතා කරන්නන්"
+msgstr "භාවිත ගිණුම"
 
 #: libraries/server_privileges.lib.php:4144
 msgid ""
@@ -13023,10 +13001,9 @@ msgid ""
 msgstr ""
 
 #: libraries/server_privileges.lib.php:4164 libraries/server_users.lib.php:25
-#, fuzzy
 #| msgid "Users overview"
 msgid "User accounts overview"
-msgstr "භාවිතා කරන්නන් පිළිබඳ දළ විශ්ලේෂණය"
+msgstr "භාවිත ගිණුම් පිළිබඳ දළ විශ්ලේෂණය"
 
 #: libraries/server_privileges.lib.php:4232
 msgid ""
@@ -14196,13 +14173,12 @@ msgstr "SQL විමසුමක් සිදු කරන්න/%s දත්�
 
 #: libraries/sql_query_form.lib.php:256
 msgid "Get auto-saved query"
-msgstr ""
+msgstr "ස්වයං සුරැකුණු විමසුම ලබාගන්න"
 
 #: libraries/sql_query_form.lib.php:267
-#, fuzzy
 #| msgid "Bad parameters!"
 msgid "Bind parameters"
-msgstr "වැරදි පරාමිතියන්!"
+msgstr "පරාමිතියන් බඳින්න"
 
 #: libraries/sql_query_form.lib.php:314
 msgid "Bookmark this SQL query:"
@@ -14354,16 +14330,14 @@ msgid "Fulltext"
 msgstr "සම්පූර්ණ පාඨය"
 
 #: libraries/structure.lib.php:1571 libraries/structure.lib.php:2208
-#, fuzzy
 #| msgid "CHAR textarea columns"
 msgid "Add to central columns"
-msgstr "CHAR පෙළ පෙදෙසේ පළල"
+msgstr "මධ්‍යම තීර වලට එක් කරන්න"
 
 #: libraries/structure.lib.php:1576 libraries/structure.lib.php:2198
-#, fuzzy
 #| msgid "Remove column(s)"
 msgid "Remove from central columns"
-msgstr "පේළි(යක්) ඉවත් කරන්න"
+msgstr "මධ්‍යම තීර වලින් ඉවත් කරන්න"
 
 #: libraries/structure.lib.php:1594 libraries/structure.lib.php:1697
 msgid "Move columns"
@@ -14382,10 +14356,9 @@ msgid "Propose table structure"
 msgstr "සැකිල්ලක් යෝජනා කරන්න"
 
 #: libraries/structure.lib.php:1700
-#, fuzzy
 #| msgid "Propose table structure"
 msgid "Improve table structure"
-msgstr "සැකිල්ලක් යෝජනා කරන්න"
+msgstr "වගුවේ සැකිල්ල වැඩි දියුණු කරන්න"
 
 #: libraries/structure.lib.php:1707
 #| msgid "Track table"
diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php
index 979b53da64..26e0a51095 100644
--- a/test/libraries/PMA_insert_edit_test.php
+++ b/test/libraries/PMA_insert_edit_test.php
@@ -2862,7 +2862,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             $actual
         );
         $this->assertContains(
-            '<span class="column_type">varchar(20)</span>',
+            '<span class="column_type" dir="ltr">varchar(20)</span>',
             $actual
         );
         $this->assertContains(
@@ -2916,7 +2916,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             $actual
         );
         $this->assertContains(
-            '<span class="column_type">datetime</span>',
+            '<span class="column_type" dir="ltr">datetime</span>',
             $actual
         );
         $this->assertContains(
@@ -2972,7 +2972,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
             $actual
         );
         $this->assertContains(
-            '<span class="column_type">longtext</span>',
+            '<span class="column_type" dir="ltr">longtext</span>',
             $actual
         );
         $this->assertContains(