From 27b213431cd07b3dcaba89d9504d39e166ed0c5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Tue, 16 Apr 2013 13:32:51 +0200
Subject: [PATCH] Reference javascript messages by dot notation instead of
 using ['strFoo']

---
 js/ajax.js                    |   8 +-
 js/config.js                  |  12 +-
 js/db_operations.js           |   6 +-
 js/db_search.js               |  34 ++---
 js/db_structure.js            |  40 +++---
 js/functions.js               | 102 ++++++-------
 js/gis_data_editor.js         |  34 ++---
 js/import.js                  |   2 +-
 js/indexes.js                 |   8 +-
 js/makegrid.js                |  26 ++--
 js/navigation.js              |   8 +-
 js/pmd/history.js             |   2 +-
 js/pmd/move.js                |  16 +--
 js/rte.js                     |  32 ++---
 js/server_databases.js        |   4 +-
 js/server_privileges.js       |  18 +--
 js/server_status_advisor.js   |  22 +--
 js/server_status_monitor.js   | 264 +++++++++++++++++-----------------
 js/server_status_queries.js   |   2 +-
 js/server_status_sorter.js    |   4 +-
 js/server_status_variables.js |   2 +-
 js/sql.js                     |  20 +--
 js/tbl_change.js              |   2 +-
 js/tbl_chart.js               |   6 +-
 js/tbl_select.js              |  12 +-
 js/tbl_structure.js           |  22 +--
 js/tbl_zoom_plot_jqplot.js    |  26 ++--
 27 files changed, 367 insertions(+), 367 deletions(-)

diff --git a/js/ajax.js b/js/ajax.js
index e19a3e7ebb..eb77304c95 100644
--- a/js/ajax.js
+++ b/js/ajax.js
@@ -516,7 +516,7 @@ AJAX.cache = {
     navigate: function (index) {
         if (typeof this.pages[index] === 'undefined') {
             PMA_ajaxShowMessage(
-                '<div class="error">' + PMA_messages['strInvalidPage'] + '</div>',
+                '<div class="error">' + PMA_messages.strInvalidPage + '</div>',
                 false
             );
         } else {
@@ -790,11 +790,11 @@ $('form').live('submit', AJAX.requestHandler);
  */
 $(document).ajaxError(function (event, request, settings) {
     if (request.status !== 0) { // Don't handle aborted requests
-        var errorCode = $.sprintf(PMA_messages['strErrorCode'], request.status);
-        var errorText = $.sprintf(PMA_messages['strErrorText'], request.statusText);
+        var errorCode = $.sprintf(PMA_messages.strErrorCode, request.status);
+        var errorText = $.sprintf(PMA_messages.strErrorText, request.statusText);
         PMA_ajaxShowMessage(
             '<div class="error">'
-            + PMA_messages['strErrorProcessingRequest']
+            + PMA_messages.strErrorProcessingRequest
             + '<div>' + errorCode + '</div>'
             + '<div>' + errorText + '</div>'
             + '</div>',
diff --git a/js/config.js b/js/config.js
index 573bac6263..b4f44ddd8c 100644
--- a/js/config.js
+++ b/js/config.js
@@ -207,7 +207,7 @@ var validators = {
             return true;
         }
         var result = this.value != '0' && validators._regexp_numeric.test(this.value);
-        return result ? true : PMA_messages['error_nan_p'];
+        return result ? true : PMA_messages.error_nan_p;
     },
     /**
      * Validates non-negative number
@@ -219,7 +219,7 @@ var validators = {
             return true;
         }
         var result = validators._regexp_numeric.test(this.value);
-        return result ? true : PMA_messages['error_nan_nneg'];
+        return result ? true : PMA_messages.error_nan_nneg;
     },
     /**
      * Validates port number
@@ -231,7 +231,7 @@ var validators = {
             return true;
         }
         var result = validators._regexp_numeric.test(this.value) && this.value != '0';
-        return result && this.value <= 65535 ? true : PMA_messages['error_incorrect_port'];
+        return result && this.value <= 65535 ? true : PMA_messages.error_incorrect_port;
     },
     /**
      * Validates value according to given regular expression
@@ -246,7 +246,7 @@ var validators = {
         // convert PCRE regexp
         var parts = regexp.match(validators._regexp_pcre_extract);
         var valid = this.value.match(new RegExp(parts[2], parts[3])) !== null;
-        return valid ? true : PMA_messages['error_invalid_value'];
+        return valid ? true : PMA_messages.error_invalid_value;
     },
     /**
      * Validates upper bound for numeric inputs
@@ -259,7 +259,7 @@ var validators = {
         if (isNaN(val)) {
             return true;
         }
-        return val <= max_value ? true : $.sprintf(PMA_messages['error_value_lte'], max_value);
+        return val <= max_value ? true : $.sprintf(PMA_messages.error_value_lte, max_value);
     },
     // field validators
     _field: {
@@ -742,7 +742,7 @@ function savePrefsToLocalStorage(form)
 function updatePrefsDate()
 {
     var d = new Date(window.localStorage['config_mtime_local']);
-    var msg = PMA_messages['strSavedOn'].replace('@DATE@', formatDate(d));
+    var msg = PMA_messages.strSavedOn.replace('@DATE@', formatDate(d));
     $('#opts_import_local_storage div.localStorage-exists').html(msg);
 }
 
diff --git a/js/db_operations.js b/js/db_operations.js
index 898c61f671..2ae779557f 100644
--- a/js/db_operations.js
+++ b/js/db_operations.js
@@ -42,7 +42,7 @@ AJAX.registerOnload('db_operations.js', function () {
         PMA_prepareForAjaxRequest($form);
 
         $form.PMA_confirm(question, $form.attr('action'), function (url) {
-            PMA_ajaxShowMessage(PMA_messages['strRenamingDatabases'], false);
+            PMA_ajaxShowMessage(PMA_messages.strRenamingDatabases, false);
             $.get(url, $("#rename_db_form").serialize() + '&is_js_confirmed=1', function (data) {
                 if (data.success === true) {
                     PMA_ajaxShowMessage(data.message);
@@ -72,7 +72,7 @@ AJAX.registerOnload('db_operations.js', function () {
      */
     $("#copy_db_form.ajax").live('submit', function (event) {
         event.preventDefault();
-        PMA_ajaxShowMessage(PMA_messages['strCopyingDatabase'], false);
+        PMA_ajaxShowMessage(PMA_messages.strCopyingDatabase, false);
         var $form = $(this);
         PMA_prepareForAjaxRequest($form);
         $.get($form.attr('action'), $form.serialize(), function (data) {
@@ -102,7 +102,7 @@ AJAX.registerOnload('db_operations.js', function () {
         event.preventDefault();
         var $form = $(this);
         PMA_prepareForAjaxRequest($form);
-        PMA_ajaxShowMessage(PMA_messages['strChangingCharset']);
+        PMA_ajaxShowMessage(PMA_messages.strChangingCharset);
         $.get($form.attr('action'), $form.serialize() + "&submitcollation=1", function (data) {
             if (data.success === true) {
                 PMA_ajaxShowMessage(data.message);
diff --git a/js/db_search.js b/js/db_search.js
index 97edd9a884..6518aa062b 100644
--- a/js/db_search.js
+++ b/js/db_search.js
@@ -38,7 +38,7 @@ function loadResult(result_path, table_name, link)
 {
     $(function () {
         /**   Hides the results shown by the delete criteria */
-        var $msg = PMA_ajaxShowMessage(PMA_messages['strBrowsing'], false);
+        var $msg = PMA_ajaxShowMessage(PMA_messages.strBrowsing, false);
         $('#sqlqueryform').hide();
         $('#togglequerybox').hide();
         /**  Load the browse results to the page */
@@ -74,14 +74,14 @@ function deleteResult(result_path, msg)
         $('#togglequerybox').hide();
         /** Conformation message for deletion */
         if (confirm(msg)) {
-            var $msg = PMA_ajaxShowMessage(PMA_messages['strDeleting'], false);
+            var $msg = PMA_ajaxShowMessage(PMA_messages.strDeleting, false);
             /** Load the deleted option to the page*/
             $('#sqlqueryform').html('');
             var url = result_path + " #result_query, #sqlqueryform";
             $('#browse-results').load(url, function () {
                 /** Refresh the search results after the deletion */
                 document.getElementById('buttonGo').click();
-                $('#togglequerybox').html(PMA_messages['strHideQueryBox']);
+                $('#togglequerybox').html(PMA_messages.strHideQueryBox);
                 /** Show the results of the deletion option */
                 $('#browse-results').show();
                 $('#sqlqueryform').show();
@@ -122,14 +122,14 @@ AJAX.registerOnload('db_search.js', function () {
      * the hide/show criteria in search result forms
      */
     $('#togglesearchresultlink')
-    .html(PMA_messages['strHideSearchResults'])
+    .html(PMA_messages.strHideSearchResults)
     .bind('click', function () {
         var $link = $(this);
         $('#searchresults').slideToggle();
-        if ($link.text() == PMA_messages['strHideSearchResults']) {
-            $link.text(PMA_messages['strShowSearchResults']);
+        if ($link.text() == PMA_messages.strHideSearchResults) {
+            $link.text(PMA_messages.strShowSearchResults);
         } else {
-            $link.text(PMA_messages['strHideSearchResults']);
+            $link.text(PMA_messages.strHideSearchResults);
         }
         /** avoid default click action */
         return false;
@@ -152,10 +152,10 @@ AJAX.registerOnload('db_search.js', function () {
     .bind('click', function () {
         var $link = $(this);
         $('#sqlqueryform').slideToggle("medium");
-        if ($link.text() == PMA_messages['strHideQueryBox']) {
-            $link.text(PMA_messages['strShowQueryBox']);
+        if ($link.text() == PMA_messages.strHideQueryBox) {
+            $link.text(PMA_messages.strShowQueryBox);
         } else {
-            $link.text(PMA_messages['strHideQueryBox']);
+            $link.text(PMA_messages.strHideQueryBox);
         }
         /** avoid default click action */
         return false;
@@ -168,14 +168,14 @@ AJAX.registerOnload('db_search.js', function () {
      * the hide/show criteria in search criteria form
      */
     $('#togglesearchformlink')
-       .html(PMA_messages['strShowSearchCriteria'])
+       .html(PMA_messages.strShowSearchCriteria)
        .bind('click', function () {
             var $link = $(this);
             $('#db_search_form').slideToggle();
-            if ($link.text() == PMA_messages['strHideSearchCriteria']) {
-                $link.text(PMA_messages['strShowSearchCriteria']);
+            if ($link.text() == PMA_messages.strHideSearchCriteria) {
+                $link.text(PMA_messages.strShowSearchCriteria);
             } else {
-                $link.text(PMA_messages['strHideSearchCriteria']);
+                $link.text(PMA_messages.strHideSearchCriteria);
             }
             /** avoid default click action */
             return false;
@@ -186,7 +186,7 @@ AJAX.registerOnload('db_search.js', function () {
     $("#db_search_form.ajax").live('submit', function (event) {
         event.preventDefault();
 
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages['strSearching'], false);
+        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strSearching, false);
         // jQuery object to reuse
         var $form = $(this);
 
@@ -200,7 +200,7 @@ AJAX.registerOnload('db_search.js', function () {
 
                 $('#togglesearchresultlink')
                 // always start with the Show message
-                .text(PMA_messages['strHideSearchResults']);
+                .text(PMA_messages.strHideSearchResults);
                 $('#togglesearchresultsdiv')
                 // now it's time to show the div containing the link
                 .show();
@@ -213,7 +213,7 @@ AJAX.registerOnload('db_search.js', function () {
                     .hide();
                 $('#togglesearchformlink')
                     // always start with the Show message
-                    .text(PMA_messages['strShowSearchCriteria']);
+                    .text(PMA_messages.strShowSearchCriteria);
                 $('#togglesearchformdiv')
                     // now it's time to show the div containing the link
                     .show();
diff --git a/js/db_structure.js b/js/db_structure.js
index 52bd5013a6..565a4214ea 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -36,13 +36,13 @@ AJAX.registerTeardown('db_structure.js', function () {
  */
 function PMA_adjustTotals() {
     var byteUnits = new Array(
-        PMA_messages['strB'],
-        PMA_messages['strKiB'],
-        PMA_messages['strMiB'],
-        PMA_messages['strGiB'],
-        PMA_messages['strTiB'],
-        PMA_messages['strPiB'],
-        PMA_messages['strEiB']
+        PMA_messages.strB,
+        PMA_messages.strKiB,
+        PMA_messages.strMiB,
+        PMA_messages.strGiB,
+        PMA_messages.strTiB,
+        PMA_messages.strPiB,
+        PMA_messages.strEiB
     );
     /**
      * @var $allTr jQuery object that references all the rows in the list of tables
@@ -123,7 +123,7 @@ function PMA_adjustTotals() {
 
     // Update summary with new data
     var $summary = $("#tbl_summary_row");
-    $summary.find('.tbl_num').text($.sprintf(PMA_messages['strTables'], tableSum));
+    $summary.find('.tbl_num').text($.sprintf(PMA_messages.strTables, tableSum));
     $summary.find('.tbl_rows').text(strRowSum);
     $summary.find('.tbl_size').text(sizeSum + " " + byteUnits[size_magnitude]);
     $summary.find('.tbl_overhead').text(overheadSum + " " + byteUnits[overhead_magnitude]);
@@ -162,19 +162,19 @@ AJAX.registerOnload('db_structure.js', function () {
     $("span.fkc_switch").click(function (event) {
         if ($("#fkc_checkbox").prop('checked')) {
             $("#fkc_checkbox").prop('checked', false);
-            $("#fkc_status").html(PMA_messages['strForeignKeyCheckDisabled']);
+            $("#fkc_status").html(PMA_messages.strForeignKeyCheckDisabled);
             return;
         }
         $("#fkc_checkbox").prop('checked', true);
-        $("#fkc_status").html(PMA_messages['strForeignKeyCheckEnabled']);
+        $("#fkc_status").html(PMA_messages.strForeignKeyCheckEnabled);
     });
 
     $('#fkc_checkbox').change(function () {
         if ($(this).prop("checked")) {
-            $("#fkc_status").html(PMA_messages['strForeignKeyCheckEnabled']);
+            $("#fkc_status").html(PMA_messages.strForeignKeyCheckEnabled);
             return;
         }
-        $("#fkc_status").html(PMA_messages['strForeignKeyCheckDisabled']);
+        $("#fkc_status").html(PMA_messages.strForeignKeyCheckDisabled);
     }); // End of event handler for 'Foreign Key Check'
 
     /**
@@ -202,7 +202,7 @@ AJAX.registerOnload('db_structure.js', function () {
 
         $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) {
 
-            PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+            PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
 
             $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function (data) {
                 if (data.success === true) {
@@ -221,7 +221,7 @@ AJAX.registerOnload('db_structure.js', function () {
                         .removeClass('truncate_table_anchor');
                     PMA_adjustTotals();
                 } else {
-                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
+                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
                 }
             }); // end $.get()
         }); //end $.PMA_confirm()
@@ -263,7 +263,7 @@ AJAX.registerOnload('db_structure.js', function () {
 
         $this_anchor.PMA_confirm(question, $this_anchor.attr('href'), function (url) {
 
-            var $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+            var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
 
             $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function (data) {
                 if (data.success === true) {
@@ -274,7 +274,7 @@ AJAX.registerOnload('db_structure.js', function () {
                     PMA_reloadNavigation();
                     PMA_ajaxRemoveMessage($msg);
                 } else {
-                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
+                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
                 }
             }); // end $.get()
         }); // end $.PMA_confirm()
@@ -295,11 +295,11 @@ AJAX.registerOnload('db_structure.js', function () {
          /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = PMA_messages['strDeleteTrackingData'];
+        var question = PMA_messages.strDeleteTrackingData;
 
         $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
 
-            PMA_ajaxShowMessage(PMA_messages['strDeletingTrackingData']);
+            PMA_ajaxShowMessage(PMA_messages.strDeletingTrackingData);
 
             $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
                 if (data.success === true) {
@@ -358,7 +358,7 @@ AJAX.registerOnload('db_structure.js', function () {
 
                     PMA_ajaxShowMessage(data.message);
                 } else {
-                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
+                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
                 }
             }); // end $.get()
         }); // end $.PMA_confirm()
@@ -375,7 +375,7 @@ AJAX.registerOnload('db_structure.js', function () {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = PMA_messages['strOperationTakesLongTime'];
+        var question = PMA_messages.strOperationTakesLongTime;
 
         $(this).PMA_confirm(question, '', function () {
             return true;
diff --git a/js/functions.js b/js/functions.js
index a7975aec48..2eacc0d67c 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -129,10 +129,10 @@ function PMA_current_version(data)
     if (data && data.version && data.date) {
         var current = parseVersionString(pmaversion);
         var latest = parseVersionString(data['version']);
-        var version_information_message = PMA_messages['strLatestAvailable'] + ' ' + escapeHtml(data['version']);
+        var version_information_message = PMA_messages.strLatestAvailable + ' ' + escapeHtml(data['version']);
         if (latest > current) {
             var message = $.sprintf(
-                PMA_messages['strNewerVersion'],
+                PMA_messages.strNewerVersion,
                 escapeHtml(data['version']),
                 escapeHtml(data['date'])
             );
@@ -144,7 +144,7 @@ function PMA_current_version(data)
             $('#maincontainer').after('<div class="' + klass + '">' + message + '</div>');
         }
         if (latest === current) {
-            version_information_message = ' (' + PMA_messages['strUpToDate'] + ')';
+            version_information_message = ' (' + PMA_messages.strUpToDate + ')';
         }
         $('#li_pma_version').append(version_information_message);
     }
@@ -180,8 +180,8 @@ function PMA_display_git_revision()
 
 function displayPasswordGenerateButton()
 {
-    $('#tr_element_before_generate_password').parent().append('<tr class="vmiddle"><td>' + PMA_messages['strGeneratePassword'] + '</td><td><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
-    $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages['strGeneratePassword'] + ':</label><span class="options"><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
+    $('#tr_element_before_generate_password').parent().append('<tr class="vmiddle"><td>' + PMA_messages.strGeneratePassword + '</td><td><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /><input type="text" name="generated_pw" id="generated_pw" /></td></tr>');
+    $('#div_element_before_generate_password').parent().append('<div class="item"><label for="button_generate_password">' + PMA_messages.strGeneratePassword + ':</label><span class="options"><input type="button" class="button" id="button_generate_password" value="' + PMA_messages['strGenerate'] + '" onclick="suggestPassword(this.form)" /></span><input type="text" name="generated_pw" id="generated_pw" /></div>');
 }
 
 /*
@@ -268,11 +268,11 @@ function confirmLink(theLink, theSqlQuery)
 {
     // Confirmation is not required in the configuration file
     // or browser is Opera (crappy js implementation)
-    if (PMA_messages['strDoYouReally'] === '' || typeof(window.opera) != 'undefined') {
+    if (PMA_messages.strDoYouReally === '' || typeof(window.opera) != 'undefined') {
         return true;
     }
 
-    var is_confirmed = confirm($.sprintf(PMA_messages['strDoYouReally'], theSqlQuery));
+    var is_confirmed = confirm($.sprintf(PMA_messages.strDoYouReally, theSqlQuery));
     if (is_confirmed) {
         if ($(theLink).hasClass('formLinkSubmit')) {
             var name = 'is_js_confirmed';
@@ -307,15 +307,15 @@ function confirmLink(theLink, theSqlQuery)
 function confirmQuery(theForm1, sqlQuery1)
 {
     // Confirmation is not required in the configuration file
-    if (PMA_messages['strDoYouReally'] === '') {
+    if (PMA_messages.strDoYouReally === '') {
         return true;
     }
 
     // "DROP DATABASE" statement isn't allowed
-    if (PMA_messages['strNoDropDatabases'] !== '') {
+    if (PMA_messages.strNoDropDatabases !== '') {
         var drop_re = new RegExp('(^|;)\\s*DROP\\s+(IF EXISTS\\s+)?DATABASE\\s', 'i');
         if (drop_re.test(sqlQuery1.value)) {
-            alert(PMA_messages['strNoDropDatabases']);
+            alert(PMA_messages.strNoDropDatabases);
             theForm1.reset();
             sqlQuery1.focus();
             return false;
@@ -341,7 +341,7 @@ function confirmQuery(theForm1, sqlQuery1)
         var message      = (sqlQuery1.value.length > 100)
                          ? sqlQuery1.value.substr(0, 100) + '\n    ...'
                          : sqlQuery1.value;
-        var is_confirmed = confirm($.sprintf(PMA_messages['strDoYouReally'], message));
+        var is_confirmed = confirm($.sprintf(PMA_messages.strDoYouReally, message));
         // statement is confirmed -> update the
         // "is_js_confirmed" form field so the confirm test won't be
         // run on the server side and allows to submit the form
@@ -410,7 +410,7 @@ function checkSqlQuery(theForm)
 
     if (isEmpty) {
         sqlQuery.select();
-        alert(PMA_messages['strFormEmpty']);
+        alert(PMA_messages.strFormEmpty);
         sqlQuery.focus();
         return false;
     }
@@ -478,7 +478,7 @@ function checkFormElementInRange(theForm, theFieldName, message, min, max)
     // It's not a number
     if (isNaN(val)) {
         theField.select();
-        alert(PMA_messages['strNotNumber']);
+        alert(PMA_messages.strNotNumber);
         theField.focus();
         return false;
     }
@@ -516,7 +516,7 @@ function checkTableEditForm(theForm, fieldsCnt)
             elm3 = $("#field_" + i + "_1");
             if (isNaN(val) && elm3.val() !== "") {
                 elm2.select();
-                alert(PMA_messages['strNotNumber']);
+                alert(PMA_messages.strNotNumber);
                 elm2.focus();
                 return false;
             }
@@ -531,14 +531,14 @@ function checkTableEditForm(theForm, fieldsCnt)
     }
     if (atLeastOneField === 0) {
         var theField = theForm.elements["field_0_1"];
-        alert(PMA_messages['strFormEmpty']);
+        alert(PMA_messages.strFormEmpty);
         theField.focus();
         return false;
     }
 
     // at least this section is under jQuery
     if ($("input.textfield[name='table']").val() === "") {
-        alert(PMA_messages['strFormEmpty']);
+        alert(PMA_messages.strFormEmpty);
         $("input.textfield[name='table']").focus();
         return false;
     }
@@ -1355,8 +1355,8 @@ AJAX.registerOnload('functions.js', function () {
         var old_text   = $inner_sql.html();
 
         var new_content = "<textarea name=\"sql_query_edit\" id=\"sql_query_edit\">" + sql_query + "</textarea>\n";
-        new_content    += "<input type=\"submit\" id=\"sql_query_edit_save\" class=\"button btnSave\" value=\"" + PMA_messages['strGo'] + "\"/>\n";
-        new_content    += "<input type=\"button\" id=\"sql_query_edit_discard\" class=\"button btnDiscard\" value=\"" + PMA_messages['strCancel'] + "\"/>\n";
+        new_content    += "<input type=\"submit\" id=\"sql_query_edit_save\" class=\"button btnSave\" value=\"" + PMA_messages.strGo + "\"/>\n";
+        new_content    += "<input type=\"button\" id=\"sql_query_edit_discard\" class=\"button btnDiscard\" value=\"" + PMA_messages.strCancel + "\"/>\n";
         var $editor_area = $('div#inline_editor');
         if ($editor_area.length === 0) {
             $editor_area = $('<div id="inline_editor_outer"></div>');
@@ -1496,7 +1496,7 @@ function catchKeypressesFromSqlTextboxes(event) {
  * message either the PMA_ajaxRemoveMessage($msg) function must be called or
  * another message must be show with PMA_ajaxShowMessage() function.
  *
- * 2) var $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+ * 2) var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
  * This is a special case. The behaviour is same as above,
  * just with a different message
  *
@@ -1534,10 +1534,10 @@ function PMA_ajaxShowMessage(message, timeout)
         return true;
     } else if (! message) {
         // If the message is undefined, show the default
-        message = PMA_messages['strLoading'];
+        message = PMA_messages.strLoading;
         dismissable = false;
         self_closing = false;
-    } else if (message == PMA_messages['strProcessingRequest']) {
+    } else if (message == PMA_messages.strProcessingRequest) {
         // This is another case where the message should not disappear
         dismissable = false;
         self_closing = false;
@@ -1593,7 +1593,7 @@ function PMA_ajaxShowMessage(message, timeout)
         PMA_tooltip(
             $retval,
             'span',
-            PMA_messages['strDismiss']
+            PMA_messages.strDismiss
         );
     }
 
@@ -1901,7 +1901,7 @@ jQuery.fn.PMA_confirm = function (question, url, callbackFn) {
             return true;
         }
     }
-    if (PMA_messages['strDoYouReally'] === '') {
+    if (PMA_messages.strDoYouReally === '') {
         return true;
     }
 
@@ -1910,14 +1910,14 @@ jQuery.fn.PMA_confirm = function (question, url, callbackFn) {
      *                          dialog
      */
     var button_options = {};
-    button_options[PMA_messages['strOK']] = function () {
+    button_options[PMA_messages.strOK] = function () {
         $(this).dialog("close");
 
         if ($.isFunction(callbackFn)) {
             callbackFn.call(this, url);
         }
     };
-    button_options[PMA_messages['strCancel']] = function () {
+    button_options[PMA_messages.strCancel] = function () {
         $(this).dialog("close");
     };
 
@@ -2021,7 +2021,7 @@ AJAX.registerOnload('functions.js', function () {
          */
 
         if (checkTableEditForm($form[0], $form.find('input[name=orig_num_fields]').val())) {
-            PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+            PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
             PMA_prepareForAjaxRequest($form);
             //User wants to submit the form
             $.post($form.attr('action'), $form.serialize() + "&do_save_data=1", function (data) {
@@ -2101,7 +2101,7 @@ AJAX.registerOnload('functions.js', function () {
          */
         var $form = $(this).closest('form');
 
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
         PMA_prepareForAjaxRequest($form);
 
         //User wants to add more fields to the table
@@ -2289,7 +2289,7 @@ AJAX.registerOnload('functions.js', function () {
             'DROP DATABASE ' + escapeHtml(PMA_commonParams.get('db'))
         );
         $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
-            PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+            PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
             $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
                 if (data.success) {
                     //Database deleted successfully, refresh both the frames
@@ -2312,8 +2312,8 @@ AJAX.registerOnload('functions.js', function () {
 /**
  * Validates the password field in a form
  *
- * @see    PMA_messages['strPasswordEmpty']
- * @see    PMA_messages['strPasswordNotSame']
+ * @see    PMA_messages.strPasswordEmpty
+ * @see    PMA_messages.strPasswordNotSame
  * @param  object $the_form The form to be validated
  * @return bool
  */
@@ -2334,9 +2334,9 @@ function PMA_checkPassword($the_form)
     var alert_msg = false;
 
     if ($password.val() === '') {
-        alert_msg = PMA_messages['strPasswordEmpty'];
+        alert_msg = PMA_messages.strPasswordEmpty;
     } else if ($password.val() != $password_repeat.val()) {
-        alert_msg = PMA_messages['strPasswordNotSame'];
+        alert_msg = PMA_messages.strPasswordNotSame;
     }
 
     if (alert_msg) {
@@ -2372,7 +2372,7 @@ AJAX.registerOnload('functions.js', function () {
          * @var button_options  Object containing options to be passed to jQueryUI's dialog
          */
         var button_options = {};
-        button_options[PMA_messages['strGo']] = function () {
+        button_options[PMA_messages.strGo] = function () {
 
             event.preventDefault();
 
@@ -2392,7 +2392,7 @@ AJAX.registerOnload('functions.js', function () {
              */
             var this_value = $(this).val();
 
-            var $msgbox = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+            var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
             $the_form.append('<input type="hidden" name="ajax_request" value="true" />');
 
             $.post($the_form.attr('action'), $the_form.serialize() + '&change_pw=' + this_value, function (data) {
@@ -2408,14 +2408,14 @@ AJAX.registerOnload('functions.js', function () {
             }); // end $.post()
         };
 
-        button_options[PMA_messages['strCancel']] = function () {
+        button_options[PMA_messages.strCancel] = function () {
             $(this).dialog('close');
         };
         $.get($(this).attr('href'), {'ajax_request': true}, function (data) {
             if (data.success) {
                 $('<div id="change_password_dialog"></div>')
                 .dialog({
-                    title: PMA_messages['strChangePassword'],
+                    title: PMA_messages.strChangePassword,
                     width: 600,
                     close: function (ev, ui) {
                         $(this).remove();
@@ -2539,9 +2539,9 @@ AJAX.registerOnload('functions.js', function () {
         var colname = $(this).closest('tr').find('input:first').val();
         // And use it to make up a title for the page
         if (colname.length < 1) {
-            var title = PMA_messages['enum_newColumnVals'];
+            var title = PMA_messages.enum_newColumnVals;
         } else {
-            var title = PMA_messages['enum_columnVals'].replace(
+            var title = PMA_messages.enum_columnVals.replace(
                 /%s/,
                 '"' + decodeURIComponent(colname) + '"'
             );
@@ -2605,14 +2605,14 @@ AJAX.registerOnload('functions.js', function () {
                    + "<fieldset>"
                    + "<legend>" + title + "</legend>"
                    + "<p>" + PMA_getImage('s_notice.png')
-                   + PMA_messages['enum_hint'] + "</p>"
+                   + PMA_messages.enum_hint + "</p>"
                    + "<table class='values'>" + fields + "</table>"
                    + "</fieldset><fieldset class='tblFooters'>"
                    + "<table class='add'><tr><td>"
                    + "<div class='slider'></div>"
                    + "</td><td>"
                    + "<form><div><input type='submit' class='add_value' value='"
-                   + $.sprintf(PMA_messages['enum_addValue'], 1)
+                   + $.sprintf(PMA_messages.enum_addValue, 1)
                    + "'/></div></form>"
                    + "</td></tr></table>"
                    + "<input type='hidden' value='" // So we know which column's data is being edited
@@ -2625,7 +2625,7 @@ AJAX.registerOnload('functions.js', function () {
          * the buttonOptions jQuery dialog bar are pressed
          */
         var buttonOptions = {};
-        buttonOptions[PMA_messages['strGo']] = function () {
+        buttonOptions[PMA_messages.strGo] = function () {
             // When the submit button is clicked,
             // put the data back into the original form
             var value_array = [];
@@ -2638,7 +2638,7 @@ AJAX.registerOnload('functions.js', function () {
             $("input#" + values_id).val(value_array.join(","));
             $(this).dialog("close");
         };
-        buttonOptions[PMA_messages['strClose']] = function () {
+        buttonOptions[PMA_messages.strClose] = function () {
             $(this).dialog("close");
         };
         // Show the dialog
@@ -2652,7 +2652,7 @@ AJAX.registerOnload('functions.js', function () {
         $enum_editor_dialog = $(dialog).dialog({
             minWidth: width,
             modal: true,
-            title: PMA_messages['enum_editor'],
+            title: PMA_messages.enum_editor,
             buttons: buttonOptions,
             open: function () {
                 // Focus the "Go" button after opening the dialog
@@ -2671,7 +2671,7 @@ AJAX.registerOnload('functions.js', function () {
             max: 9,
             slide: function (event, ui) {
                 $(this).closest('table').find('input[type=submit]').val(
-                    $.sprintf(PMA_messages['enum_addValue'], ui.value)
+                    $.sprintf(PMA_messages.enum_addValue, ui.value)
                 );
             }
         });
@@ -2787,7 +2787,7 @@ function indexEditorDialog(url, title, callback_success, callback_failure)
      *                     passed to jQueryUI dialog
      */
     var button_options = {};
-    button_options[PMA_messages['strGo']] = function () {
+    button_options[PMA_messages.strGo] = function () {
         /**
          * @var    the_form    object referring to the export form
          */
@@ -2836,7 +2836,7 @@ function indexEditorDialog(url, title, callback_success, callback_failure)
             }
         }); // end $.post()
     };
-    button_options[PMA_messages['strCancel']] = function () {
+    button_options[PMA_messages.strCancel] = function () {
         $(this).dialog('close');
     };
     var $msgbox = PMA_ajaxShowMessage();
@@ -2870,7 +2870,7 @@ function indexEditorDialog(url, title, callback_success, callback_failure)
                 max: 16,
                 slide: function (event, ui) {
                     $(this).closest('fieldset').find('input[type=submit]').val(
-                        $.sprintf(PMA_messages['strAddToIndex'], ui.value)
+                        $.sprintf(PMA_messages.strAddToIndex, ui.value)
                     );
                 }
             });
@@ -3365,7 +3365,7 @@ AJAX.registerOnload('functions.js', function () {
 
         $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
 
-            var $msgbox = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+            var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
             $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
                 if (data.success === true) {
                     PMA_ajaxRemoveMessage($msgbox);
@@ -3396,7 +3396,7 @@ AJAX.registerOnload('functions.js', function () {
             'TRUNCATE ' + PMA_commonParams.get('table')
         );
         $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
-            PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+            PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
             $.get(url, {'is_js_confirmed': '1', 'ajax_request': true}, function (data) {
                 if ($("#sqlqueryresults").length !== 0) {
                     $("#sqlqueryresults").remove();
@@ -3665,7 +3665,7 @@ function PMA_createViewDialog($this)
         if (data.success === true) {
             PMA_ajaxRemoveMessage($msg);
             var buttonOptions = {};
-            buttonOptions[PMA_messages['strGo']] = function () {
+            buttonOptions[PMA_messages.strGo] = function () {
                 if (typeof CodeMirror !== 'undefined') {
                     syntaxHighlighter.save();
                 }
@@ -3681,7 +3681,7 @@ function PMA_createViewDialog($this)
                     }
                 });
             };
-            buttonOptions[PMA_messages['strClose']] = function () {
+            buttonOptions[PMA_messages.strClose] = function () {
                 $(this).dialog("close");
             };
             var $dialog = $('<div/>').attr('id', 'createViewDialog').append(data.message).dialog({
diff --git a/js/gis_data_editor.js b/js/gis_data_editor.js
index 5d1b71299f..8c84f0bd88 100644
--- a/js/gis_data_editor.js
+++ b/js/gis_data_editor.js
@@ -24,13 +24,13 @@ function closeGISEditor() {
 function prepareJSVersion() {
     // Change the text on the submit button
     $("#gis_editor input[name='gis_data[save]']")
-        .val(PMA_messages['strCopy'])
+        .val(PMA_messages.strCopy)
         .insertAfter($('#gis_data_textarea'))
         .before('<br/><br/>');
 
     // Add close and cancel links
-    $('#gis_data_editor').prepend('<a class="close_gis_editor" href="#">' + PMA_messages['strClose'] + '</a>');
-    $('<a class="cancel_gis_editor" href="#"> ' + PMA_messages['strCancel'] + '</a>')
+    $('#gis_data_editor').prepend('<a class="close_gis_editor" href="#">' + PMA_messages.strClose + '</a>');
+    $('<a class="cancel_gis_editor" href="#"> ' + PMA_messages.strCancel + '</a>')
         .insertAfter($("input[name='gis_data[save]']"));
 
     // Remove the unnecessary text
@@ -56,10 +56,10 @@ function prepareJSVersion() {
  * @returns the HTML for a data point
  */
 function addDataPoint(pointNumber, prefix) {
-    return '<br/>' + $.sprintf(PMA_messages['strPointN'], (pointNumber + 1)) + ': '
-        + '<label for="x">' + PMA_messages['strX'] + '</label>'
+    return '<br/>' + $.sprintf(PMA_messages.strPointN, (pointNumber + 1)) + ': '
+        + '<label for="x">' + PMA_messages.strX + '</label>'
         + '<input type="text" name="' + prefix + '[' + pointNumber + '][x]" value=""/>'
-        + '<label for="y">' + PMA_messages['strY'] + '</label>'
+        + '<label for="y">' + PMA_messages.strY + '</label>'
         + '<input type="text" name="' + prefix + '[' + pointNumber + '][y]" value=""/>';
 }
 
@@ -315,10 +315,10 @@ AJAX.registerOnload('gis_data_editor.js', function () {
         // Add the new linesting of inner ring based on the type
         var html = '<br/>';
         if (type == 'MULTILINESTRING') {
-            html += PMA_messages['strLineString'] + ' ' + (noOfLines + 1) + ':';
+            html += PMA_messages.strLineString + ' ' + (noOfLines + 1) + ':';
             var noOfPoints = 2;
         } else {
-            html += PMA_messages['strInnerRing'] + ' ' + noOfLines + ':';
+            html += PMA_messages.strInnerRing + ' ' + noOfLines + ':';
             var noOfPoints = 4;
         }
         html += '<input type="hidden" name="' + prefix + '[' + noOfLines + '][no_of_points]" value="' + noOfPoints + '"/>';
@@ -326,7 +326,7 @@ AJAX.registerOnload('gis_data_editor.js', function () {
             html += addDataPoint(i, (prefix + '[' + noOfLines + ']'));
         }
         html += '<a class="addPoint addJs" name="' + prefix + '[' + noOfLines + '][add_point]" href="#">+ '
-            + PMA_messages['strAddPoint'] + '</a><br/>';
+            + PMA_messages.strAddPoint + '</a><br/>';
 
         $a.before(html);
         $noOfLinesInput.val(noOfLines + 1);
@@ -345,17 +345,17 @@ AJAX.registerOnload('gis_data_editor.js', function () {
         var noOfPolygons = parseInt($noOfPolygonsInput.val(), 10);
 
         // Add the new polygon
-        var html = PMA_messages['strPolygon'] + ' ' + (noOfPolygons + 1) + ':<br/>';
+        var html = PMA_messages.strPolygon + ' ' + (noOfPolygons + 1) + ':<br/>';
         html += '<input type="hidden" name="' + prefix + '[' + noOfPolygons + '][no_of_lines]" value="1"/>'
-            + '<br/>' + PMA_messages['strOuterRing'] + ':'
+            + '<br/>' + PMA_messages.strOuterRing + ':'
             + '<input type="hidden" name="' + prefix + '[' + noOfPolygons + '][0][no_of_points]" value="4"/>';
         for (var i = 0; i < 4; i++) {
             html += addDataPoint(i, (prefix + '[' + noOfPolygons + '][0]'));
         }
         html += '<a class="addPoint addJs" name="' + prefix + '[' + noOfPolygons + '][0][add_point]" href="#">+ '
-            + PMA_messages['strAddPoint'] + '</a><br/>'
+            + PMA_messages.strAddPoint + '</a><br/>'
             + '<a class="addLine addJs" name="' + prefix + '[' + noOfPolygons + '][add_line]" href="#">+ '
-            + PMA_messages['strAddInnerRing'] + '</a><br/><br/>';
+            + PMA_messages.strAddInnerRing + '</a><br/><br/>';
 
         $a.before(html);
         $noOfPolygonsInput.val(noOfPolygons + 1);
@@ -371,13 +371,13 @@ AJAX.registerOnload('gis_data_editor.js', function () {
         var $noOfGeomsInput = $("input[name='" + prefix + "[geom_count]" + "']");
         var noOfGeoms = parseInt($noOfGeomsInput.val(), 10);
 
-        var html1 = PMA_messages['strGeometry'] + ' ' + (noOfGeoms + 1) + ':<br/>';
+        var html1 = PMA_messages.strGeometry + ' ' + (noOfGeoms + 1) + ':<br/>';
         var $geomType = $("select[name='gis_data[" + (noOfGeoms - 1) + "][gis_type]']").clone();
         $geomType.attr('name', 'gis_data[' + noOfGeoms + '][gis_type]').val('POINT');
-        var html2 = '<br/>' + PMA_messages['strPoint'] + ' :'
-            + '<label for="x"> ' + PMA_messages['strX'] + ' </label>'
+        var html2 = '<br/>' + PMA_messages.strPoint + ' :'
+            + '<label for="x"> ' + PMA_messages.strX + ' </label>'
             + '<input type="text" name="gis_data[' + noOfGeoms + '][POINT][x]" value=""/>'
-            + '<label for="y"> ' + PMA_messages['strY'] + ' </label>'
+            + '<label for="y"> ' + PMA_messages.strY + ' </label>'
             + '<input type="text" name="gis_data[' + noOfGeoms + '][POINT][y]" value=""/>'
             + '<br/><br/>';
 
diff --git a/js/import.js b/js/import.js
index b78d97bb38..b5ae52ca18 100644
--- a/js/import.js
+++ b/js/import.js
@@ -17,7 +17,7 @@ function changePluginOpts()
     var selected_plugin_name = $("#plugins option:selected").val();
     $("#" + selected_plugin_name + "_options").fadeIn('slow');
     if (selected_plugin_name == "csv") {
-        $("#import_notification").text(PMA_messages['strImportCSV']);
+        $("#import_notification").text(PMA_messages.strImportCSV);
     } else {
         $("#import_notification").text("");
     }
diff --git a/js/indexes.js b/js/indexes.js
index c5f349e175..f33879d832 100644
--- a/js/indexes.js
+++ b/js/indexes.js
@@ -133,7 +133,7 @@ AJAX.registerOnload('indexes.js', function () {
         );
 
         $anchor.PMA_confirm(question, $anchor.attr('href'), function (url) {
-            var $msg = PMA_ajaxShowMessage(PMA_messages['strDroppingPrimaryKeyIndex'], false);
+            var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingPrimaryKeyIndex, false);
             $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
                 if (data.success === true) {
                     PMA_ajaxRemoveMessage($msg);
@@ -165,7 +165,7 @@ AJAX.registerOnload('indexes.js', function () {
                     });
                     PMA_reloadNavigation();
                 } else {
-                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
+                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
                 }
             }); // end $.get()
         }); // end $.PMA_confirm()
@@ -187,14 +187,14 @@ AJAX.registerOnload('indexes.js', function () {
                 return;
             }
             var url = $(this).closest('form').serialize();
-            var title = PMA_messages['strAddIndex'];
+            var title = PMA_messages.strAddIndex;
         } else {
             // Edit index
             var url = $(this).find("a").attr("href");
             if (url.substring(0, 16) == "tbl_indexes.php?") {
                 url = url.substring(16, url.length);
             }
-            var title = PMA_messages['strEditIndex'];
+            var title = PMA_messages.strEditIndex;
         }
         url += "&ajax_request=true";
         indexEditorDialog(url, title, function () {
diff --git a/js/makegrid.js b/js/makegrid.js
index 7045323e95..2b2e882201 100644
--- a/js/makegrid.js
+++ b/js/makegrid.js
@@ -1402,7 +1402,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             $(g.cPointer).css('visibility', 'hidden');  // set visibility to hidden instead of calling hide() to force browsers to cache the image in cPointer class
 
             // assign column reordering hint
-            g.reorderHint = PMA_messages['strColOrderHint'];
+            g.reorderHint = PMA_messages.strColOrderHint;
 
             // get data columns in the first row of the table
             var $firstRowCols = $(g.t).find('tr:first th.draggable');
@@ -1491,7 +1491,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             $(g.cList).hide();
 
             // assign column visibility related hints
-            g.showAllColText = PMA_messages['strShowAllCol'];
+            g.showAllColText = PMA_messages.strShowAllCol;
 
             // get data columns in the first row of the table
             var $firstRowCols = $(g.t).find('tr:first th.draggable');
@@ -1516,7 +1516,7 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
                 PMA_tooltip(
                     $colVisibTh,
                     'th',
-                    PMA_messages['strColVisibHint']
+                    PMA_messages.strColVisibHint
                 );
 
                 // create column visibility drop-down arrow(s)
@@ -1605,11 +1605,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             $(g.cEdit).hide();
 
             // assign cell editing hint
-            g.cellEditHint = PMA_messages['strCellEditHint'];
-            g.saveCellWarning = PMA_messages['strSaveCellWarning'];
-            g.alertNonUnique = PMA_messages['strAlertNonUnique'];
-            g.gotoLinkText = PMA_messages['strGoToLink'];
-            g.showDataRowLinkText = PMA_messages['strShowDataRowLink'];
+            g.cellEditHint = PMA_messages.strCellEditHint;
+            g.saveCellWarning = PMA_messages.strSaveCellWarning;
+            g.alertNonUnique = PMA_messages.strAlertNonUnique;
+            g.gotoLinkText = PMA_messages.strGoToLink;
+            g.showDataRowLinkText = PMA_messages.strShowDataRowLink;
 
             // initialize cell editing configuration
             g.saveCellsAtOnce = $('#save_cells_at_once').val();
@@ -1709,11 +1709,11 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
             $(g.gDiv).append(g.cEdit);
 
             // add hint for grid editing feature when hovering "Edit" link in each table row
-            if (PMA_messages['strGridEditFeatureHint'] !== undefined) {
+            if (PMA_messages.strGridEditFeatureHint !== undefined) {
                 PMA_tooltip(
                     $(g.t).find('.edit_row_anchor a'),
                     'a',
-                    PMA_messages['strGridEditFeatureHint']
+                    PMA_messages.strGridEditFeatureHint
                 );
             }
         }
@@ -1751,9 +1751,9 @@ function PMA_makegrid(t, enableResize, enableReorder, enableVisib, enableGridEdi
     g.tableCreateTime = $('#table_create_time').val();
 
     // assign the hints
-    g.sortHint = PMA_messages['strSortHint'];
-    g.markHint = PMA_messages['strColMarkHint'];
-    g.copyHint = PMA_messages['strColNameCopyHint'];
+    g.sortHint = PMA_messages.strSortHint;
+    g.markHint = PMA_messages.strColMarkHint;
+    g.copyHint = PMA_messages.strColNameCopyHint;
 
     // assign common hidden inputs
     var $common_hidden_inputs = $('div.common_hidden_inputs');
diff --git a/js/navigation.js b/js/navigation.js
index 87b517b3e5..90b46ee2c2 100644
--- a/js/navigation.js
+++ b/js/navigation.js
@@ -186,7 +186,7 @@ $(function () {
         var url = $(this).attr('href').substr(
             $(this).attr('href').indexOf('?') + 1
         ) + '&ajax_request=true';
-        var title = PMA_messages['strAddIndex'];
+        var title = PMA_messages.strAddIndex;
         indexEditorDialog(url, title);
     });
 
@@ -196,7 +196,7 @@ $(function () {
         var url = $(this).attr('href').substr(
             $(this).attr('href').indexOf('?') + 1
         ) + '&ajax_request=true';
-        var title = PMA_messages['strEditIndex'];
+        var title = PMA_messages.strEditIndex;
         indexEditorDialog(url, title);
     });
 
@@ -381,12 +381,12 @@ var ResizeHandler = function () {
             $collapser
                 .css(this.left, pos + resizer_width)
                 .html(this.getSymbol(pos))
-                .prop('title', PMA_messages['strShowPanel']);
+                .prop('title', PMA_messages.strShowPanel);
         } else {
             $collapser
                 .css(this.left, pos)
                 .html(this.getSymbol(pos))
-                .prop('title', PMA_messages['strHidePanel']);
+                .prop('title', PMA_messages.strHidePanel);
         }
         setTimeout(function () {
             $(window).trigger('resize');
diff --git a/js/pmd/history.js b/js/pmd/history.js
index 56dc559317..6b1be194a9 100644
--- a/js/pmd/history.js
+++ b/js/pmd/history.js
@@ -73,7 +73,7 @@ function display(init, finit)
             if (history_array[i].get_type() == "GroupBy" || history_array[i].get_type() == "OrderBy") {
                 str += '</td><td class="center">' + PMA_getImage('b_info.png', detail(i)) + '<td title="' + detail(i) + '">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete(' + i + ')>' + PMA_getImage('b_drop.png', 'Delete') + '</td></tr></thead>';
             } else {
-                str += '</td><td class="center">' + PMA_getImage('b_info.png', detail(i)) + '</td><td title="' + detail(i) + '">' + history_array[i].get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit(' + i + ')>' + PMA_getImage('b_edit.png', PMA_messages['strEdit']) + '</td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'"               onclick=history_delete(' + i + ')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
+                str += '</td><td class="center">' + PMA_getImage('b_info.png', detail(i)) + '</td><td title="' + detail(i) + '">' + history_array[i].get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit(' + i + ')>' + PMA_getImage('b_edit.png', PMA_messages.strEdit) + '</td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'"               onclick=history_delete(' + i + ')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
             }
             i++;
             if (i >= history_array.length) {
diff --git a/js/pmd/move.js b/js/pmd/move.js
index ae1aca8e2e..597e19dc3b 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -44,7 +44,7 @@ FIXME: we can't register the beforeonload event because it will persist between
 AJAX.registerOnload('pmd/move.js', function (){
     $(window).bind('beforeunload', function () {        // onbeforeunload for the frame window.
         if (_change == 1 && _staying === 0) {
-            return PMA_messages['strLeavingDesigner'];
+            return PMA_messages.strLeavingDesigner;
         } else if (_change == 1 && _staying == 1) {
             _staying = 0;
         }
@@ -56,7 +56,7 @@ AJAX.registerOnload('pmd/move.js', function (){
         if (_change == 1 && _staying === 0) {
             _staying = 1;                                                   //  Helps if the user stays on the page  as there
             setTimeout('make_zero();', 100);                    //   is no other way of knowing whether the user stayed or not.
-            return PMA_messages['strLeavingDesigner'];
+            return PMA_messages.strLeavingDesigner;
         }
     };
 });*/
@@ -582,7 +582,7 @@ function Start_relation()
     if (!ON_relation) {
         document.getElementById('foreign_relation').style.display = '';
         ON_relation = 1;
-        document.getElementById('pmd_hint').innerHTML = PMA_messages['strSelectReferencedKey'];
+        document.getElementById('pmd_hint').innerHTML = PMA_messages.strSelectReferencedKey;
         document.getElementById('pmd_hint').style.display = 'block';
         document.getElementById('rel_button').className = 'M_butt_Selected_down';
     } else {
@@ -600,7 +600,7 @@ function Click_field(T, f, PK) // table field
         if (!click_field) {
             //.style.display=='none'        .style.display = 'none'
             if (!PK) {
-                alert(PMA_messages['strPleaseSelectPrimaryOrUniqueKey']);
+                alert(PMA_messages.strPleaseSelectPrimaryOrUniqueKey);
                 return;// 0;
             }//PK
             if (j_tabs[db + '.' + T] != '1') {
@@ -608,7 +608,7 @@ function Click_field(T, f, PK) // table field
             }
             click_field = 1;
             link_relation = "T1=" + T + "&F1=" + f;
-            document.getElementById('pmd_hint').innerHTML = PMA_messages['strSelectForeignKey'];
+            document.getElementById('pmd_hint').innerHTML = PMA_messages.strSelectForeignKey;
         } else {
             Start_relation(); // hidden hint...
             if (j_tabs[db + '.' + T] != '1' || !PK) {
@@ -1047,7 +1047,7 @@ function Start_display_field()
     }
     if (!ON_display_field) {
         ON_display_field = 1;
-        document.getElementById('pmd_hint').innerHTML = PMA_messages['strChangeDisplay'];
+        document.getElementById('pmd_hint').innerHTML = PMA_messages.strChangeDisplay;
         document.getElementById('pmd_hint').style.display = 'block';
         document.getElementById('display_field_button').className = 'M_butt_Selected_down';//'#FFEE99';gray #AAAAAA
 
@@ -1111,7 +1111,7 @@ function Click_option(id_this, column_name, table_name)
     // var top = Glob_Y - document.getElementById(id_this).offsetHeight - 10;
     document.getElementById(id_this).style.top  = (screen.height / 4) + 'px';
     document.getElementById(id_this).style.display = 'block';
-    document.getElementById('option_col_name').innerHTML = '<strong>' + PMA_messages['strAddOption'] + '"' + column_name + '"</strong>';
+    document.getElementById('option_col_name').innerHTML = '<strong>' + PMA_messages.strAddOption + '"' + column_name + '"</strong>';
     col_name = column_name;
     tab_name = table_name;
 }
@@ -1270,7 +1270,7 @@ function add_object()
         document.getElementById('orderby').checked = false;
         //make orderby
     }
-    PMA_ajaxShowMessage($.sprintf(PMA_messages['strObjectsCreated'], sum));
+    PMA_ajaxShowMessage($.sprintf(PMA_messages.strObjectsCreated, sum));
     //output sum new objects created
     var existingDiv = document.getElementById('ab');
     existingDiv.innerHTML = display(init, history_array.length);
diff --git a/js/rte.js b/js/rte.js
index 20ef257c2f..fb19666a2f 100644
--- a/js/rte.js
+++ b/js/rte.js
@@ -72,7 +72,7 @@ RTE.COMMON = {
         $elm = $('table.rte_table').last().find('input[name=item_name]');
         if ($elm.val() === '') {
             $elm.focus();
-            alert(PMA_messages['strFormEmpty']);
+            alert(PMA_messages.strFormEmpty);
             return false;
         }
         $elm = $('table.rte_table').find('textarea[name=item_definition]');
@@ -83,7 +83,7 @@ RTE.COMMON = {
             else {
                 $('textarea[name=item_definition]').last().focus();
             }
-            alert(PMA_messages['strFormEmpty']);
+            alert(PMA_messages.strFormEmpty);
             return false;
         }
         // The validation has so far passed, so now
@@ -119,7 +119,7 @@ RTE.COMMON = {
                  *                     for jQueryUI dialog buttons
                  */
                 var button_options = {};
-                button_options[PMA_messages['strClose']] = function () {
+                button_options[PMA_messages.strClose] = function () {
                     $(this).dialog("close").remove();
                 };
                 /**
@@ -176,7 +176,7 @@ RTE.COMMON = {
                 PMA_ajaxRemoveMessage($msg);
                 // Now define the function that is called when
                 // the user presses the "Go" button
-                that.buttonOptions[PMA_messages['strGo']] = function () {
+                that.buttonOptions[PMA_messages.strGo] = function () {
                     // Move the data from the codemirror editor back to the
                     // textarea, where it can be used in the form submission.
                     if (typeof CodeMirror != 'undefined') {
@@ -189,7 +189,7 @@ RTE.COMMON = {
                          */
                         var data = $('form.rte_form').last().serialize();
                         $msg = PMA_ajaxShowMessage(
-                            PMA_messages['strProcessingRequest']
+                            PMA_messages.strProcessingRequest
                         );
                         var url = $('form.rte_form').last().attr('action');
                         $.post(url, data, function (data) {
@@ -290,7 +290,7 @@ RTE.COMMON = {
                         }); // end $.post()
                     } // end "if (that.validate())"
                 }; // end of function that handles the submission of the Editor
-                that.buttonOptions[PMA_messages['strClose']] = function () {
+                that.buttonOptions[PMA_messages.strClose] = function () {
                     $(this).dialog("close");
                 };
                 /**
@@ -361,7 +361,7 @@ RTE.COMMON = {
              * @var msg jQuery object containing the reference to
              *          the AJAX message shown to the user
              */
-            var $msg = PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+            var $msg = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
             $.get(url, {'is_js_confirmed': 1, 'ajax_request': true}, function (data) {
                 if (data.success === true) {
                     /**
@@ -430,7 +430,7 @@ RTE.EVENT = {
             $elm = this.$ajaxDialog.find('input[name=item_interval_value]');
             if ($elm.val() === '') {
                 $elm.focus();
-                alert(PMA_messages['strFormEmpty']);
+                alert(PMA_messages.strFormEmpty);
                 return false;
             }
         } else {
@@ -438,7 +438,7 @@ RTE.EVENT = {
             $elm = this.$ajaxDialog.find('input[name=item_execute_at]');
             if ($elm.val() === '') {
                 $elm.focus();
-                alert(PMA_messages['strFormEmpty']);
+                alert(PMA_messages.strFormEmpty);
                 return false;
             }
         }
@@ -516,7 +516,7 @@ RTE.ROUTINE = {
             }
         });
         if (! isSuccess) {
-            alert(PMA_messages['strFormEmpty']);
+            alert(PMA_messages.strFormEmpty);
             return false;
         }
         this.$ajaxDialog.find('table.routine_params_table').last().find('tr').each(function () {
@@ -533,7 +533,7 @@ RTE.ROUTINE = {
             }
         });
         if (! isSuccess) {
-            alert(PMA_messages['strFormEmpty']);
+            alert(PMA_messages.strFormEmpty);
             return false;
         }
         if (this.$ajaxDialog.find('select[name=item_type]').find(':selected').val() === 'FUNCTION') {
@@ -544,7 +544,7 @@ RTE.ROUTINE = {
             if (($returntyp.val() === 'ENUM' || $returntyp.val() === 'SET' || $returntyp.val().substr(0, 3) === 'VAR')
                && $returnlen.val() === '') {
                 $returnlen.focus();
-                alert(PMA_messages['strFormEmpty']);
+                alert(PMA_messages.strFormEmpty);
                 return false;
             }
         }
@@ -552,7 +552,7 @@ RTE.ROUTINE = {
             // A function must contain a RETURN statement in its definition
             if (this.$ajaxDialog.find('table.rte_table').find('textarea[name=item_definition]').val().toUpperCase().indexOf('RETURN') < 0) {
                 this.syntaxHiglighter.focus();
-                alert(PMA_messages['MissingReturn']);
+                alert(PMA_messages.MissingReturn);
                 return false;
             }
         }
@@ -665,13 +665,13 @@ RTE.ROUTINE = {
                 if (data.dialog) {
                     // Define the function that is called when
                     // the user presses the "Go" button
-                    that.buttonOptions[PMA_messages['strGo']] = function () {
+                    that.buttonOptions[PMA_messages.strGo] = function () {
                         /**
                          * @var data Form data to be sent in the AJAX request
                          */
                         var data = $('form.rte_form').last().serialize();
                         $msg = PMA_ajaxShowMessage(
-                            PMA_messages['strProcessingRequest']
+                            PMA_messages.strProcessingRequest
                         );
                         $.post('db_routines.php', data, function (data) {
                             if (data.success === true) {
@@ -684,7 +684,7 @@ RTE.ROUTINE = {
                             }
                         });
                     };
-                    that.buttonOptions[PMA_messages['strClose']] = function () {
+                    that.buttonOptions[PMA_messages.strClose] = function () {
                         $(this).dialog("close");
                     };
                     /**
diff --git a/js/server_databases.js b/js/server_databases.js
index a22d111d3b..3bd6d51357 100644
--- a/js/server_databases.js
+++ b/js/server_databases.js
@@ -97,11 +97,11 @@ AJAX.registerOnload('server_databases.js', function () {
         var newDbNameInput = $form.find('input[name=new_db]');
         if (newDbNameInput.val() === '') {
             newDbNameInput.focus();
-            alert(PMA_messages['strFormEmpty']);
+            alert(PMA_messages.strFormEmpty);
             return;
         }
 
-        PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+        PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
         PMA_prepareForAjaxRequest($form);
 
         $.post($form.attr('action'), $form.serialize(), function (data) {
diff --git a/js/server_privileges.js b/js/server_privileges.js
index edbdfa1715..79441e24a2 100644
--- a/js/server_privileges.js
+++ b/js/server_privileges.js
@@ -17,13 +17,13 @@
 function checkAddUser(the_form)
 {
     if (the_form.elements['pred_hostname'].value == 'userdefined' && the_form.elements['hostname'].value === '') {
-        alert(PMA_messages['strHostEmpty']);
+        alert(PMA_messages.strHostEmpty);
         the_form.elements['hostname'].focus();
         return false;
     }
 
     if (the_form.elements['pred_username'].value == 'userdefined' && the_form.elements['username'].value === '') {
-        alert(PMA_messages['strUserEmpty']);
+        alert(PMA_messages.strUserEmpty);
         the_form.elements['username'].focus();
         return false;
     }
@@ -134,7 +134,7 @@ function addUser($form)
                             .html(priv_data.user_form)
                             .insertAfter('#result_query');
                     } else {
-                        PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + priv_data.error, false);
+                        PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + priv_data.error, false);
                     }
                 });
             } else {
@@ -234,7 +234,7 @@ AJAX.registerOnload('server_privileges.js', function () {
     $("#reload_privileges_anchor.ajax").live("click", function (event) {
         event.preventDefault();
 
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages['strReloadingPrivileges']);
+        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strReloadingPrivileges);
 
         $.get($(this).attr("href"), {'ajax_request': true}, function (data) {
             if (data.success === true) {
@@ -256,7 +256,7 @@ AJAX.registerOnload('server_privileges.js', function () {
     $("#fieldset_delete_user_footer #buttonGo.ajax").live('click', function (event) {
         event.preventDefault();
 
-        PMA_ajaxShowMessage(PMA_messages['strRemovingSelectedUsers']);
+        PMA_ajaxShowMessage(PMA_messages.strRemovingSelectedUsers);
 
         var $form = $("#usersForm");
 
@@ -361,7 +361,7 @@ AJAX.registerOnload('server_privileges.js', function () {
             return false;
         }
 
-        PMA_ajaxShowMessage(PMA_messages['strProcessingRequest']);
+        PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
 
         $t.append('<input type="hidden" name="ajax_request" value="true" />');
 
@@ -467,7 +467,7 @@ AJAX.registerOnload('server_privileges.js', function () {
         }
         var $msgbox = PMA_ajaxShowMessage();
         var button_options = {};
-        button_options[PMA_messages['strClose']] = function () {
+        button_options[PMA_messages.strClose] = function () {
             $(this).dialog("close");
         };
         $.post(
@@ -526,7 +526,7 @@ AJAX.registerOnload('server_privileges.js', function () {
          * @var button_options  Object containing options for jQueryUI dialog buttons
          */
         var button_options = {};
-        button_options[PMA_messages['strClose']] = function () {
+        button_options[PMA_messages.strClose] = function () {
             $(this).dialog("close");
         };
         $.get($(this).attr('href'), {'ajax_request': true}, function (data) {
@@ -594,7 +594,7 @@ AJAX.registerOnload('server_privileges.js', function () {
     $('#checkbox_drop_users_db').click(function () {
         var $this_checkbox = $(this);
         if ($this_checkbox.is(':checked')) {
-            var is_confirmed = confirm(PMA_messages['strDropDatabaseStrongWarning'] + '\n' + $.sprintf(PMA_messages['strDoYouReally'], 'DROP DATABASE'));
+            var is_confirmed = confirm(PMA_messages.strDropDatabaseStrongWarning + '\n' + $.sprintf(PMA_messages['strDoYouReally'], 'DROP DATABASE'));
             if (! is_confirmed) {
                 $this_checkbox.prop('checked', false);
             }
diff --git a/js/server_status_advisor.js b/js/server_status_advisor.js
index f15ec13111..473cc949fa 100644
--- a/js/server_status_advisor.js
+++ b/js/server_status_advisor.js
@@ -24,11 +24,11 @@ AJAX.registerOnload('server_status_advisor.js', function () {
 
     $('a[href="#openAdvisorInstructions"]').click(function () {
         var dlgBtns = {};
-        dlgBtns[PMA_messages['strClose']] = function () {
+        dlgBtns[PMA_messages.strClose] = function () {
             $(this).dialog('close');
         };
         $instructionsDialog.dialog({
-            title: PMA_messages['strAdvisorSystem'],
+            title: PMA_messages.strAdvisorSystem,
             width: 700,
             buttons: dlgBtns
         });
@@ -53,9 +53,9 @@ AJAX.registerOnload('server_status_advisor.js', function () {
     }
 
     if (data.run.fired.length > 0) {
-        $cnt.append('<p><b>' + PMA_messages['strPerformanceIssues'] + '</b></p>');
+        $cnt.append('<p><b>' + PMA_messages.strPerformanceIssues + '</b></p>');
         $cnt.append('<table class="data" id="rulesFired" border="0"><thead><tr>' +
-                    '<th>' + PMA_messages['strIssuse'] + '</th><th>' + PMA_messages['strRecommendation'] +
+                    '<th>' + PMA_messages.strIssuse + '</th><th>' + PMA_messages['strRecommendation'] +
                     '</th></tr></thead><tbody></tbody></table>');
         $tbody = $cnt.find('table#rulesFired');
 
@@ -72,17 +72,17 @@ AJAX.registerOnload('server_status_advisor.js', function () {
             $tr.click(function () {
                 var rule = $(this).data('rule');
                 $dialog
-                .dialog({title: PMA_messages['strRuleDetails']})
+                .dialog({title: PMA_messages.strRuleDetails})
                 .html(
-                    '<p><b>' + PMA_messages['strIssuse'] + ':</b><br />' + rule.issue + '</p>' +
-                    '<p><b>' + PMA_messages['strRecommendation'] + ':</b><br />' + rule.recommendation + '</p>' +
-                    '<p><b>' + PMA_messages['strJustification'] + ':</b><br />' + rule.justification + '</p>' +
-                    '<p><b>' + PMA_messages['strFormula'] + ':</b><br />' + rule.formula + '</p>' +
-                    '<p><b>' + PMA_messages['strTest'] + ':</b><br />' + rule.test + '</p>'
+                    '<p><b>' + PMA_messages.strIssuse + ':</b><br />' + rule.issue + '</p>' +
+                    '<p><b>' + PMA_messages.strRecommendation + ':</b><br />' + rule.recommendation + '</p>' +
+                    '<p><b>' + PMA_messages.strJustification + ':</b><br />' + rule.justification + '</p>' +
+                    '<p><b>' + PMA_messages.strFormula + ':</b><br />' + rule.formula + '</p>' +
+                    '<p><b>' + PMA_messages.strTest + ':</b><br />' + rule.test + '</p>'
                 );
 
                 var dlgBtns = {};
-                dlgBtns[PMA_messages['strClose']] = function () {
+                dlgBtns[PMA_messages.strClose] = function () {
                     $(this).dialog('close');
                 };
 
diff --git a/js/server_status_monitor.js b/js/server_status_monitor.js
index e8d47469be..f109a30e3f 100644
--- a/js/server_status_monitor.js
+++ b/js/server_status_monitor.js
@@ -158,9 +158,9 @@ AJAX.registerOnload('server_status_monitor.js', function () {
     var presetCharts = {
         // Query cache efficiency
         'qce': {
-            title: PMA_messages['strQueryCacheEfficiency'],
+            title: PMA_messages.strQueryCacheEfficiency,
             series: [ {
-                label: PMA_messages['strQueryCacheEfficiency']
+                label: PMA_messages.strQueryCacheEfficiency
             } ],
             nodes: [ {
                 dataPoints: [{type: 'statusvar', name: 'Qcache_hits'}, {type: 'statusvar', name: 'Com_select'}],
@@ -170,9 +170,9 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         },
         // Query cache usage
         'qcu': {
-            title: PMA_messages['strQueryCacheUsage'],
+            title: PMA_messages.strQueryCacheUsage,
             series: [ {
-                label: PMA_messages['strQueryCacheUsed']
+                label: PMA_messages.strQueryCacheUsed
             } ],
             nodes: [ {
                 dataPoints: [{type: 'statusvar', name: 'Qcache_free_memory'}, {type: 'servervar', name: 'query_cache_size'}],
@@ -195,9 +195,9 @@ AJAX.registerOnload('server_status_monitor.js', function () {
     case 'WINNT':
         $.extend(presetCharts, {
             'cpu': {
-                title: PMA_messages['strSystemCPUUsage'],
+                title: PMA_messages.strSystemCPUUsage,
                 series: [ {
-                    label: PMA_messages['strAverageLoad']
+                    label: PMA_messages.strAverageLoad
                 } ],
                 nodes: [ {
                     dataPoints: [{ type: 'cpu', name: 'loadavg'}]
@@ -206,13 +206,13 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             },
 
             'memory': {
-                title: PMA_messages['strSystemMemory'],
+                title: PMA_messages.strSystemMemory,
                 series: [ {
-                    label: PMA_messages['strTotalMemory'],
+                    label: PMA_messages.strTotalMemory,
                     fill: true
                 }, {
                     dataType: 'memory',
-                    label: PMA_messages['strUsedMemory'],
+                    label: PMA_messages.strUsedMemory,
                     fill: true
                 } ],
                 nodes: [{ dataPoints: [{ type: 'memory', name: 'MemTotal' }], valueDivisor: 1024 },
@@ -222,12 +222,12 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             },
 
             'swap': {
-                title: PMA_messages['strSystemSwap'],
+                title: PMA_messages.strSystemSwap,
                 series: [ {
-                    label: PMA_messages['strTotalSwap'],
+                    label: PMA_messages.strTotalSwap,
                     fill: true
                 }, {
-                    label: PMA_messages['strUsedSwap'],
+                    label: PMA_messages.strUsedSwap,
                     fill: true
                 } ],
                 nodes: [{ dataPoints: [{ type: 'memory', name: 'SwapTotal' }]},
@@ -241,20 +241,20 @@ AJAX.registerOnload('server_status_monitor.js', function () {
     case 'Linux':
         $.extend(presetCharts, {
             'cpu': {
-                title: PMA_messages['strSystemCPUUsage'],
+                title: PMA_messages.strSystemCPUUsage,
                 series: [ {
-                    label: PMA_messages['strAverageLoad']
+                    label: PMA_messages.strAverageLoad
                 } ],
                 nodes: [{ dataPoints: [{ type: 'cpu', name: 'irrelevant' }], transformFn: 'cpu-linux'}],
                 maxYLabel: 0
             },
             'memory': {
-                title: PMA_messages['strSystemMemory'],
+                title: PMA_messages.strSystemMemory,
                 series: [
-                    { label: PMA_messages['strBufferedMemory'], fill: true},
-                    { label: PMA_messages['strUsedMemory'], fill: true},
-                    { label: PMA_messages['strCachedMemory'], fill: true},
-                    { label: PMA_messages['strFreeMemory'], fill: true}
+                    { label: PMA_messages.strBufferedMemory, fill: true},
+                    { label: PMA_messages.strUsedMemory, fill: true},
+                    { label: PMA_messages.strCachedMemory, fill: true},
+                    { label: PMA_messages.strFreeMemory, fill: true}
                 ],
                 nodes: [
                     { dataPoints: [{ type: 'memory', name: 'Buffers' }], valueDivisor: 1024 },
@@ -265,11 +265,11 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                 maxYLabel: 0
             },
             'swap': {
-                title: PMA_messages['strSystemSwap'],
+                title: PMA_messages.strSystemSwap,
                 series: [
-                    { label: PMA_messages['strCachedSwap'], fill: true},
-                    { label: PMA_messages['strUsedSwap'], fill: true},
-                    { label: PMA_messages['strFreeSwap'], fill: true}
+                    { label: PMA_messages.strCachedSwap, fill: true},
+                    { label: PMA_messages.strUsedSwap, fill: true},
+                    { label: PMA_messages.strFreeSwap, fill: true}
                 ],
                 nodes: [
                     { dataPoints: [{ type: 'memory', name: 'SwapCached' }], valueDivisor: 1024 },
@@ -284,9 +284,9 @@ AJAX.registerOnload('server_status_monitor.js', function () {
     case 'SunOS':
         $.extend(presetCharts, {
             'cpu': {
-                title: PMA_messages['strSystemCPUUsage'],
+                title: PMA_messages.strSystemCPUUsage,
                 series: [ {
-                    label: PMA_messages['strAverageLoad']
+                    label: PMA_messages.strAverageLoad
                 } ],
                 nodes: [ {
                     dataPoints: [{ type: 'cpu', name: 'loadavg'}]
@@ -294,10 +294,10 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                 maxYLabel: 0
             },
             'memory': {
-                title: PMA_messages['strSystemMemory'],
+                title: PMA_messages.strSystemMemory,
                 series: [
-                    { label: PMA_messages['strUsedMemory'], fill: true },
-                    { label: PMA_messages['strFreeMemory'], fill: true }
+                    { label: PMA_messages.strUsedMemory, fill: true },
+                    { label: PMA_messages.strFreeMemory, fill: true }
                 ],
                 nodes: [
                     { dataPoints: [{ type: 'memory', name: 'MemUsed' }], valueDivisor: 1024 },
@@ -306,10 +306,10 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                 maxYLabel: 0
             },
             'swap': {
-                title: PMA_messages['strSystemSwap'],
+                title: PMA_messages.strSystemSwap,
                 series: [
-                    { label: PMA_messages['strUsedSwap'], fill: true },
-                    { label: PMA_messages['strFreeSwap'], fill: true }
+                    { label: PMA_messages.strUsedSwap, fill: true },
+                    { label: PMA_messages.strFreeSwap, fill: true }
                 ],
                 nodes: [
                     { dataPoints: [{ type: 'memory', name: 'SwapUsed' }], valueDivisor: 1024 },
@@ -324,9 +324,9 @@ AJAX.registerOnload('server_status_monitor.js', function () {
     // Default setting for the chart grid
     var defaultChartGrid = {
         'c0': {
-            title: PMA_messages['strQuestions'],
+            title: PMA_messages.strQuestions,
             series: [
-                {label: PMA_messages['strQuestions']}
+                {label: PMA_messages.strQuestions}
             ],
             nodes: [
                 {dataPoints: [{ type: 'statusvar', name: 'Questions' }], display: 'differential' }
@@ -334,10 +334,10 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             maxYLabel: 0
         },
         'c1': {
-            title: PMA_messages['strChartConnectionsTitle'],
+            title: PMA_messages.strChartConnectionsTitle,
             series: [
-                {label: PMA_messages['strConnections']},
-                {label: PMA_messages['strProcesses']}
+                {label: PMA_messages.strConnections},
+                {label: PMA_messages.strProcesses}
             ],
             nodes: [
                 {dataPoints: [{ type: 'statusvar', name: 'Connections' }], display: 'differential' },
@@ -346,10 +346,10 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             maxYLabel: 0
         },
         'c2': {
-            title: PMA_messages['strTraffic'],
+            title: PMA_messages.strTraffic,
             series: [
-                {label: PMA_messages['strBytesSent']},
-                {label: PMA_messages['strBytesReceived']}
+                {label: PMA_messages.strBytesSent},
+                {label: PMA_messages.strBytesReceived}
             ],
             nodes: [
                 {dataPoints: [{ type: 'statusvar', name: 'Bytes_sent' }], display: 'differential', valueDivisor: 1024 },
@@ -576,7 +576,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         event.preventDefault();
         var dlgButtons = { };
 
-        dlgButtons[PMA_messages['strAddChart']] = function () {
+        dlgButtons[PMA_messages.strAddChart] = function () {
             var type = $('input[name="chartType"]:checked').val();
 
             if (type == 'preset') {
@@ -586,7 +586,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                 // each time he adds a series
                 // So here we only warn if he didn't add a series yet
                 if (! newChart || ! newChart.nodes || newChart.nodes.length === 0) {
-                    alert(PMA_messages['strAddOneSeriesWarning']);
+                    alert(PMA_messages.strAddOneSeriesWarning);
                     return;
                 }
             }
@@ -602,7 +602,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             $(this).dialog("close");
         };
 
-        dlgButtons[PMA_messages['strClose']] = function () {
+        dlgButtons[PMA_messages.strClose] = function () {
             newChart = null;
             $('span#clearSeriesLink').hide();
             $('#seriesPreview').html('');
@@ -643,7 +643,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             buttons: dlgButtons
         });
 
-        $('#addChartDialog #seriesPreview').html('<i>' + PMA_messages['strNone'] + '</i>');
+        $('#addChartDialog #seriesPreview').html('<i>' + PMA_messages.strNone + '</i>');
 
         return false;
     });
@@ -681,13 +681,13 @@ AJAX.registerOnload('server_status_monitor.js', function () {
 
     $('a[href="#importMonitorConfig"]').click(function (event) {
         event.preventDefault();
-        $('#emptyDialog').dialog({title: PMA_messages['strImportDialogTitle']});
-        $('#emptyDialog').html(PMA_messages['strImportDialogMessage'] + ':<br/><form action="file_echo.php?' + PMA_commonParams.get('common_query') + '&import=1" method="post" enctype="multipart/form-data">' +
+        $('#emptyDialog').dialog({title: PMA_messages.strImportDialogTitle});
+        $('#emptyDialog').html(PMA_messages.strImportDialogMessage + ':<br/><form action="file_echo.php?' + PMA_commonParams.get('common_query') + '&import=1" method="post" enctype="multipart/form-data">' +
             '<input type="file" name="file"> <input type="hidden" name="import" value="1"> </form>');
 
         var dlgBtns = {};
 
-        dlgBtns[PMA_messages['strImport']] = function () {
+        dlgBtns[PMA_messages.strImport] = function () {
             var $iframe, $form;
             $('body').append($iframe = $('<iframe id="monitorConfigUpload" style="display:none;"></iframe>'));
             var d = $iframe[0].contentWindow.document;
@@ -704,14 +704,14 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                     // Chrome wraps around '<pre style="word-wrap: break-word; white-space: pre-wrap;">' to any text content -.-
                     json = $.secureEvalJSON(data.substring(data.indexOf("{"), data.lastIndexOf("}") + 1));
                 } catch (err) {
-                    alert(PMA_messages['strFailedParsingConfig']);
+                    alert(PMA_messages.strFailedParsingConfig);
                     $('#emptyDialog').dialog('close');
                     return;
                 }
 
                 // Basic check, is this a monitor config json?
                 if (!json || ! json.monitorCharts || ! json.monitorCharts) {
-                    alert(PMA_messages['strFailedParsingConfig']);
+                    alert(PMA_messages.strFailedParsingConfig);
                     $('#emptyDialog').dialog('close');
                     return;
                 }
@@ -722,7 +722,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                     window.localStorage['monitorSettings'] = $.toJSON(json.monitorSettings);
                     rebuildGrid();
                 } catch (err) {
-                    alert(PMA_messages['strFailedBuildingGrid']);
+                    alert(PMA_messages.strFailedBuildingGrid);
                     // If an exception is thrown, load default again
                     window.localStorage.removeItem('monitorCharts');
                     window.localStorage.removeItem('monitorSettings');
@@ -737,7 +737,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             $('#emptyDialog').append('<img class="ajaxIcon" src="' + pmaThemeImage + 'ajax_clock_small.gif" alt="">');
         };
 
-        dlgBtns[PMA_messages['strCancel']] = function () {
+        dlgBtns[PMA_messages.strCancel] = function () {
             $(this).dialog('close');
         };
 
@@ -762,9 +762,9 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         event.preventDefault();
         runtime.redrawCharts = ! runtime.redrawCharts;
         if (! runtime.redrawCharts) {
-            $(this).html(PMA_getImage('play.png') + ' ' + PMA_messages['strResumeMonitor']);
+            $(this).html(PMA_getImage('play.png') + ' ' + PMA_messages.strResumeMonitor);
         } else {
-            $(this).html(PMA_getImage('pause.png') + ' ' + PMA_messages['strPauseMonitor']);
+            $(this).html(PMA_getImage('pause.png') + ' ' + PMA_messages.strPauseMonitor);
             if (! runtime.charts) {
                 initGrid();
                 $('a[href="#settingsPopup"]').show();
@@ -801,40 +801,40 @@ AJAX.registerOnload('server_status_monitor.js', function () {
 
                     if (logVars['general_log'] == 'ON') {
                         if (logVars['slow_query_log'] == 'ON') {
-                            msg = PMA_messages['strBothLogOn'];
+                            msg = PMA_messages.strBothLogOn;
                         } else {
-                            msg = PMA_messages['strGenLogOn'];
+                            msg = PMA_messages.strGenLogOn;
                         }
                     }
 
                     if (msg.length === 0 && logVars['slow_query_log'] == 'ON') {
-                        msg = PMA_messages['strSlowLogOn'];
+                        msg = PMA_messages.strSlowLogOn;
                     }
 
                     if (msg.length === 0) {
                         icon = PMA_getImage('s_error.png');
-                        msg = PMA_messages['strBothLogOff'];
+                        msg = PMA_messages.strBothLogOff;
                     }
 
-                    str = '<b>' + PMA_messages['strCurrentSettings'] + '</b><br/><div class="smallIndent">';
+                    str = '<b>' + PMA_messages.strCurrentSettings + '</b><br/><div class="smallIndent">';
                     str += icon + msg + '<br />';
 
                     if (logVars['log_output'] != 'TABLE') {
-                        str += PMA_getImage('s_error.png') + ' ' + PMA_messages['strLogOutNotTable'] + '<br />';
+                        str += PMA_getImage('s_error.png') + ' ' + PMA_messages.strLogOutNotTable + '<br />';
                     } else {
-                        str += PMA_getImage('s_success.png') + ' ' + PMA_messages['strLogOutIsTable'] + '<br />';
+                        str += PMA_getImage('s_success.png') + ' ' + PMA_messages.strLogOutIsTable + '<br />';
                     }
 
                     if (logVars['slow_query_log'] == 'ON') {
                         if (logVars['long_query_time'] > 2) {
                             str += PMA_getImage('s_attention.png') + ' '
-                                + $.sprintf(PMA_messages['strSmallerLongQueryTimeAdvice'], logVars['long_query_time'])
+                                + $.sprintf(PMA_messages.strSmallerLongQueryTimeAdvice, logVars['long_query_time'])
                                 + '<br />';
                         }
 
                         if (logVars['long_query_time'] < 2) {
                             str += PMA_getImage('s_success.png') + ' '
-                                + $.sprintf(PMA_messages['strLongQueryTimeSet'], logVars['long_query_time'])
+                                + $.sprintf(PMA_messages.strLongQueryTimeSet, logVars['long_query_time'])
                                 + '<br />';
                         }
                     }
@@ -842,9 +842,9 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                     str += '</div>';
 
                     if (is_superuser) {
-                        str += '<p></p><b>' + PMA_messages['strChangeSettings'] + '</b>';
+                        str += '<p></p><b>' + PMA_messages.strChangeSettings + '</b>';
                         str += '<div class="smallIndent">';
-                        str += PMA_messages['strSettingsAppliedGlobal'] + '<br/>';
+                        str += PMA_messages.strSettingsAppliedGlobal + '<br/>';
 
                         var varValue = 'TABLE';
                         if (logVars['log_output'] == 'TABLE') {
@@ -852,26 +852,26 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                         }
 
                         str += '- <a class="set" href="#log_output-' + varValue + '">'
-                            + $.sprintf(PMA_messages['strSetLogOutput'], varValue)
+                            + $.sprintf(PMA_messages.strSetLogOutput, varValue)
                             + ' </a><br />';
 
                         if (logVars['general_log'] != 'ON') {
                             str += '- <a class="set" href="#general_log-ON">'
-                                + $.sprintf(PMA_messages['strEnableVar'], 'general_log')
+                                + $.sprintf(PMA_messages.strEnableVar, 'general_log')
                                 + ' </a><br />';
                         } else {
                             str += '- <a class="set" href="#general_log-OFF">'
-                                + $.sprintf(PMA_messages['strDisableVar'], 'general_log')
+                                + $.sprintf(PMA_messages.strDisableVar, 'general_log')
                                 + ' </a><br />';
                         }
 
                         if (logVars['slow_query_log'] != 'ON') {
                             str += '- <a class="set" href="#slow_query_log-ON">'
-                                +  $.sprintf(PMA_messages['strEnableVar'], 'slow_query_log')
+                                +  $.sprintf(PMA_messages.strEnableVar, 'slow_query_log')
                                 + ' </a><br />';
                         } else {
                             str += '- <a class="set" href="#slow_query_log-OFF">'
-                                +  $.sprintf(PMA_messages['strDisableVar'], 'slow_query_log')
+                                +  $.sprintf(PMA_messages.strDisableVar, 'slow_query_log')
                                 + ' </a><br />';
                         }
 
@@ -881,11 +881,11 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                         }
 
                         str += '- <a class="set" href="#long_query_time-' + varValue + '">'
-                            + $.sprintf(PMA_messages['setSetLongQueryTime'], varValue)
+                            + $.sprintf(PMA_messages.setSetLongQueryTime, varValue)
                             + ' </a><br />';
 
                     } else {
-                        str += PMA_messages['strNoSuperUser'] + '<br/>';
+                        str += PMA_messages.strNoSuperUser + '<br/>';
                     }
 
                     str += '</div>';
@@ -914,7 +914,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
     $('input[name="chartType"]').change(function () {
         $('#chartVariableSettings').toggle(this.checked && this.value == 'variable');
         var title = $('input[name="chartTitle"]').val();
-        if (title == PMA_messages['strChartTitle']
+        if (title == PMA_messages.strChartTitle
            || title == $('label[for="' + $('input[name="chartTitle"]').data('lastRadio') + '"]').text()
         ) {
             $('input[name="chartTitle"]')
@@ -941,7 +941,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
     $('a[href="#kibDivisor"]').click(function (event) {
         event.preventDefault();
         $('input[name="valueDivisor"]').val(1024);
-        $('input[name="valueUnit"]').val(PMA_messages['strKiB']);
+        $('input[name="valueUnit"]').val(PMA_messages.strKiB);
         $('span.unitInput').toggle(true);
         $('input[name="useUnit"]').prop('checked', true);
         return false;
@@ -950,7 +950,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
     $('a[href="#mibDivisor"]').click(function (event) {
         event.preventDefault();
         $('input[name="valueDivisor"]').val(1024 * 1024);
-        $('input[name="valueUnit"]').val(PMA_messages['strMiB']);
+        $('input[name="valueUnit"]').val(PMA_messages.strMiB);
         $('span.unitInput').toggle(true);
         $('input[name="useUnit"]').prop('checked', true);
         return false;
@@ -958,7 +958,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
 
     $('a[href="#submitClearSeries"]').click(function (event) {
         event.preventDefault();
-        $('#seriesPreview').html('<i>' + PMA_messages['strNone'] + '</i>');
+        $('#seriesPreview').html('<i>' + PMA_messages.strNone + '</i>');
         newChart = null;
         $('#clearSeriesLink').hide();
     });
@@ -997,9 +997,9 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             serie.unit = $('input[name="valueUnit"]').val();
         }
 
-        var str = serie.display == 'differential' ? ', ' + PMA_messages['strDifferential'] : '';
-        str += serie.valueDivisor ? (', ' + $.sprintf(PMA_messages['strDividedBy'], serie.valueDivisor)) : '';
-        str += serie.unit ? (', ' + PMA_messages['strUnit'] + ': ' + serie.unit) : '';
+        var str = serie.display == 'differential' ? ', ' + PMA_messages.strDifferential : '';
+        str += serie.valueDivisor ? (', ' + $.sprintf(PMA_messages.strDividedBy, serie.valueDivisor)) : '';
+        str += serie.unit ? (', ' + PMA_messages.strUnit + ': ' + serie.unit) : '';
 
         var newSeries = {
             label: $('#variableInput').val().replace(/_/g, " ")
@@ -1039,11 +1039,11 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             $('a[href="#clearMonitorConfig"]').toggle(runtime.charts !== null);
 
             if (runtime.charts !== null && monitorProtocolVersion != window.localStorage['monitorVersion']) {
-                $('#emptyDialog').dialog({title: PMA_messages['strIncompatibleMonitorConfig']});
-                $('#emptyDialog').html(PMA_messages['strIncompatibleMonitorConfigDescription']);
+                $('#emptyDialog').dialog({title: PMA_messages.strIncompatibleMonitorConfig});
+                $('#emptyDialog').html(PMA_messages.strIncompatibleMonitorConfigDescription);
 
                 var dlgBtns = {};
-                dlgBtns[PMA_messages['strClose']] = function () { $(this).dialog('close'); };
+                dlgBtns[PMA_messages.strClose] = function () { $(this).dialog('close'); };
 
                 $('#emptyDialog').dialog({
                     width: 400,
@@ -1185,19 +1185,19 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             }
         };
 
-        if (settings.title === PMA_messages['strSystemCPUUsage']
-            || settings.title === PMA_messages['strQueryCacheEfficiency']) {
+        if (settings.title === PMA_messages.strSystemCPUUsage
+            || settings.title === PMA_messages.strQueryCacheEfficiency) {
             settings.axes.yaxis.tickOptions = {
                 formatString: "%d %%"
             };
-        } else if (settings.title === PMA_messages['strSystemMemory']
-            || settings.title === PMA_messages['strSystemSwap']
+        } else if (settings.title === PMA_messages.strSystemMemory
+            || settings.title === PMA_messages.strSystemSwap
         ) {
             settings.stackSeries = true;
             settings.axes.yaxis.tickOptions = {
                 formatter: $.jqplot.byteFormatter(2) // MiB
             };
-        } else if (settings.title === PMA_messages['strTraffic']) {
+        } else if (settings.title === PMA_messages.strTraffic) {
             settings.axes.yaxis.tickOptions = {
                 formatter: $.jqplot.byteFormatter(1) // KiB
             };
@@ -1344,14 +1344,14 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             return;
         }
 
-        var htmlStr = '<p><b>' + PMA_messages['strChartTitle'] + ': </b> <br/> <input type="text" size="35" name="chartTitle" value="' + chart.title + '" />';
-        htmlStr += '</p><p><b>' + PMA_messages['strSeries'] + ':</b> </p><ol>';
+        var htmlStr = '<p><b>' + PMA_messages.strChartTitle + ': </b> <br/> <input type="text" size="35" name="chartTitle" value="' + chart.title + '" />';
+        htmlStr += '</p><p><b>' + PMA_messages.strSeries + ':</b> </p><ol>';
         for (var i = 0; i < chart.nodes.length; i++) {
             htmlStr += '<li><i>' + chart.nodes[i].dataPoints[0].name  + ': </i><br/><input type="text" name="chartSerie-' + i + '" value="' + chart.nodes[i].name + '" /></li>';
         }
 
         dlgBtns = {};
-        dlgBtns[PMA_messages['strSave']] = function () {
+        dlgBtns[PMA_messages.strSave] = function () {
             runtime.charts[chartKey].title = $('#emptyDialog input[name="chartTitle"]').val();
             runtime.charts[chartKey].chart.setTitle({ text: runtime.charts[chartKey].title });
 
@@ -1365,13 +1365,13 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             $(this).dialog('close');
             saveMonitor();
         };
-        dlgBtns[PMA_messages['strCancel']] = function () {
+        dlgBtns[PMA_messages.strCancel] = function () {
             $(this).dialog('close');
         };
 
         $('#emptyDialog').html(htmlStr + '</ol>');
         $('#emptyDialog').dialog({
-            title: PMA_messages['strChartEdit'],
+            title: PMA_messages.strChartEdit,
             width: 'auto',
             height: 'auto',
             buttons: dlgBtns
@@ -1386,12 +1386,12 @@ AJAX.registerOnload('server_status_monitor.js', function () {
 
         var dlgBtns = { };
 
-        dlgBtns[PMA_messages['strFromSlowLog']] = function () {
+        dlgBtns[PMA_messages.strFromSlowLog] = function () {
             loadLog('slow', min, max);
             $(this).dialog("close");
         };
 
-        dlgBtns[PMA_messages['strFromGeneralLog']] = function () {
+        dlgBtns[PMA_messages.strFromGeneralLog] = function () {
             loadLog('general', min, max);
             $(this).dialog("close");
         };
@@ -1531,8 +1531,8 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                                 elem.chart.series[j].data.splice(0, elem.chart.series[j].data.length - runtime.gridMaxPoints);
                             }
                         }
-                        if (elem.title === PMA_messages['strSystemMemory']
-                            || elem.title === PMA_messages['strSystemSwap']
+                        if (elem.title === PMA_messages.strSystemMemory
+                            || elem.title === PMA_messages.strSystemSwap
                         ) {
                             total += value;
                         }
@@ -1546,15 +1546,15 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                     (runtime.xmax - tickInterval * 3), (runtime.xmax - tickInterval * 2),
                     (runtime.xmax - tickInterval), runtime.xmax];
 
-                if (elem.title !== PMA_messages['strSystemCPUUsage']
-                    && elem.title !== PMA_messages['strQueryCacheEfficiency']
-                    && elem.title !== PMA_messages['strSystemMemory']
-                    && elem.title !== PMA_messages['strSystemSwap']
+                if (elem.title !== PMA_messages.strSystemCPUUsage
+                    && elem.title !== PMA_messages.strQueryCacheEfficiency
+                    && elem.title !== PMA_messages.strSystemMemory
+                    && elem.title !== PMA_messages.strSystemSwap
                 ) {
                     elem.chart['axes']['yaxis']['max'] = Math.ceil(elem.maxYLabel * 1.1);
                     elem.chart['axes']['yaxis']['tickInterval'] = Math.ceil(elem.maxYLabel * 1.1 / 5);
-                } else if (elem.title === PMA_messages['strSystemMemory']
-                    || elem.title === PMA_messages['strSystemSwap']
+                } else if (elem.title === PMA_messages.strSystemMemory
+                    || elem.title === PMA_messages.strSystemSwap
                 ) {
                     elem.chart['axes']['yaxis']['max'] = Math.ceil(total * 1.1 / 100) * 100;
                     elem.chart['axes']['yaxis']['tickInterval'] = Math.ceil(total * 1.1 / 5);
@@ -1655,13 +1655,13 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             opts.limitTypes = false;
         }
 
-        $('#emptyDialog').dialog({title: PMA_messages['strAnalysingLogsTitle']});
-        $('#emptyDialog').html(PMA_messages['strAnalysingLogs'] +
+        $('#emptyDialog').dialog({title: PMA_messages.strAnalysingLogsTitle});
+        $('#emptyDialog').html(PMA_messages.strAnalysingLogs +
                                 ' <img class="ajaxIcon" src="' + pmaThemeImage +
                                 'ajax_clock_small.gif" alt="">');
         var dlgBtns = {};
 
-        dlgBtns[PMA_messages['strCancelRequest']] = function () {
+        dlgBtns[PMA_messages.strCancelRequest] = function () {
             if (logRequest !== null) {
                 logRequest.abort();
             }
@@ -1697,8 +1697,8 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                     runtime.logDataCols = buildLogTable(logData);
 
                     /* Show some stats in the dialog */
-                    $('#emptyDialog').dialog({title: PMA_messages['strLoadingLogs']});
-                    $('#emptyDialog').html('<p>' + PMA_messages['strLogDataLoaded'] + '</p>');
+                    $('#emptyDialog').dialog({title: PMA_messages.strLoadingLogs});
+                    $('#emptyDialog').html('<p>' + PMA_messages.strLogDataLoaded + '</p>');
                     $.each(logData.sum, function (key, value) {
                         key = key.charAt(0).toUpperCase() + key.slice(1).toLowerCase();
                         if (key == 'Total') {
@@ -1711,15 +1711,15 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                     if (logData.numRows > 12) {
                         $('#logTable').prepend(
                             '<fieldset id="logDataFilter">' +
-                            '    <legend>' + PMA_messages['strFiltersForLogTable'] + '</legend>' +
+                            '    <legend>' + PMA_messages.strFiltersForLogTable + '</legend>' +
                             '    <div class="formelement">' +
-                            '        <label for="filterQueryText">' + PMA_messages['strFilterByWordRegexp'] + '</label>' +
+                            '        <label for="filterQueryText">' + PMA_messages.strFilterByWordRegexp + '</label>' +
                             '        <input name="filterQueryText" type="text" id="filterQueryText" style="vertical-align: baseline;" />' +
                             '    </div>' +
-                            ((logData.numRows > 250) ? ' <div class="formelement"><button name="startFilterQueryText" id="startFilterQueryText">' + PMA_messages['strFilter'] + '</button></div>' : '') +
+                            ((logData.numRows > 250) ? ' <div class="formelement"><button name="startFilterQueryText" id="startFilterQueryText">' + PMA_messages.strFilter + '</button></div>' : '') +
                             '    <div class="formelement">' +
                             '       <input type="checkbox" id="noWHEREData" name="noWHEREData" value="1" /> ' +
-                            '       <label for="noWHEREData"> ' + PMA_messages['strIgnoreWhereAndGroup'] + '</label>' +
+                            '       <label for="noWHEREData"> ' + PMA_messages.strIgnoreWhereAndGroup + '</label>' +
                             '   </div' +
                             '</fieldset>'
                         );
@@ -1737,7 +1737,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                     }
 
                     var dlgBtns = {};
-                    dlgBtns[PMA_messages['strJumpToTable']] = function () {
+                    dlgBtns[PMA_messages.strJumpToTable] = function () {
                         $(this).dialog("close");
                         $(document).scrollTop($('#logTable').offset().top);
                     };
@@ -1745,11 +1745,11 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                     $('#emptyDialog').dialog("option", "buttons", dlgBtns);
 
                 } else {
-                    $('#emptyDialog').dialog({title: PMA_messages['strNoDataFoundTitle']});
-                    $('#emptyDialog').html('<p>' + PMA_messages['strNoDataFound'] + '</p>');
+                    $('#emptyDialog').dialog({title: PMA_messages.strNoDataFoundTitle});
+                    $('#emptyDialog').html('<p>' + PMA_messages.strNoDataFound + '</p>');
 
                     var dlgBtns = {};
-                    dlgBtns[PMA_messages['strClose']] = function () {
+                    dlgBtns[PMA_messages.strClose] = function () {
                         $(this).dialog("close");
                     };
 
@@ -1906,8 +1906,8 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             // Display some stats at the bottom of the table
             $('#logTable table tfoot tr')
                 .html('<th colspan="' + (runtime.logDataCols.length - 1) + '">' +
-                      PMA_messages['strSumRows'] + ' ' + rowSum + '<span style="float:right">' +
-                      PMA_messages['strTotal'] + '</span></th><th class="right">' + totalSum + '</th>');
+                      PMA_messages.strSumRows + ' ' + rowSum + '<span style="float:right">' +
+                      PMA_messages.strTotal + '</span></th><th class="right">' + totalSum + '</th>');
         }
     }
 
@@ -1982,17 +1982,17 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         }
 
         $table.append('<tfoot>' +
-                    '<tr><th colspan="' + (cols.length - 1) + '">' + PMA_messages['strSumRows'] +
-                    ' ' + data.numRows + '<span style="float:right">' + PMA_messages['strTotal'] +
+                    '<tr><th colspan="' + (cols.length - 1) + '">' + PMA_messages.strSumRows +
+                    ' ' + data.numRows + '<span style="float:right">' + PMA_messages.strTotal +
                     '</span></th><th class="right">' + data.sum.TOTAL + '</th></tr></tfoot>');
 
         // Append a tooltip to the count column, if there exist one
         if ($('#logTable th:last').html() == '#') {
             $('#logTable th:last').append('&nbsp;' + PMA_getImage('b_docs.png', '', {'class': 'qroupedQueryInfoIcon'}));
 
-            var tooltipContent = PMA_messages['strCountColumnExplanation'];
+            var tooltipContent = PMA_messages.strCountColumnExplanation;
             if (groupInserts) {
-                tooltipContent += '<p>' + PMA_messages['strMoreCountColumnExplanation'] + '</p>';
+                tooltipContent += '<p>' + PMA_messages.strMoreCountColumnExplanation + '</p>';
             }
 
             PMA_tooltip(
@@ -2034,10 +2034,10 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         var profilingChart = null;
         var dlgBtns = {};
 
-        dlgBtns[PMA_messages['strAnalyzeQuery']] = function () {
+        dlgBtns[PMA_messages.strAnalyzeQuery] = function () {
             loadQueryAnalysis(rowData);
         };
-        dlgBtns[PMA_messages['strClose']] = function () {
+        dlgBtns[PMA_messages.strClose] = function () {
             $(this).dialog('close');
         };
 
@@ -2065,7 +2065,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
         var db = rowData.db || '';
 
         $('#queryAnalyzerDialog div.placeHolder').html(
-            PMA_messages['strAnalyzing'] + ' <img class="ajaxIcon" src="' +
+            PMA_messages.strAnalyzing + ' <img class="ajaxIcon" src="' +
             pmaThemeImage + 'ajax_clock_small.gif" alt="">');
 
         $.post('server_status_monitor.php?' + PMA_commonParams.get('common_query'), {
@@ -2085,7 +2085,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
             $('#queryAnalyzerDialog div.placeHolder')
                 .html('<table width="100%" border="0"><tr><td class="explain"></td><td class="chart"></td></tr></table>');
 
-            var explain = '<b>' + PMA_messages['strExplainOutput'] + '</b> ' + $('#explain_docu').html();
+            var explain = '<b>' + PMA_messages.strExplainOutput + '</b> ' + $('#explain_docu').html();
             if (data.explain.length > 1) {
                 explain += ' (';
                 for (var i = 0; i < data.explain.length; i++) {
@@ -2113,7 +2113,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                 explain += '</div>';
             }
 
-            explain += '<p><b>' + PMA_messages['strAffectedRows'] + '</b> ' + data.affectedRows;
+            explain += '<p><b>' + PMA_messages.strAffectedRows + '</b> ' + data.affectedRows;
 
             $('#queryAnalyzerDialog div.placeHolder td.explain').append(explain);
 
@@ -2125,7 +2125,7 @@ AJAX.registerOnload('server_status_monitor.js', function () {
 
             if (data.profiling) {
                 var chartData = [];
-                var numberTable = '<table class="queryNums"><thead><tr><th>' + PMA_messages['strStatus'] + '</th><th>' + PMA_messages['strTime'] + '</th></tr></thead><tbody>';
+                var numberTable = '<table class="queryNums"><thead><tr><th>' + PMA_messages.strStatus + '</th><th>' + PMA_messages['strTime'] + '</th></tr></thead><tbody>';
                 var duration;
                 var otherTime = 0;
 
@@ -2149,15 +2149,15 @@ AJAX.registerOnload('server_status_monitor.js', function () {
                 }
 
                 if (otherTime > 0) {
-                    chartData.push([PMA_prettyProfilingNum(otherTime, 2) + ' ' + PMA_messages['strOther'], otherTime]);
+                    chartData.push([PMA_prettyProfilingNum(otherTime, 2) + ' ' + PMA_messages.strOther, otherTime]);
                 }
 
-                numberTable += '<tr><td><b>' + PMA_messages['strTotalTime'] + '</b></td><td>' + PMA_prettyProfilingNum(totalTime, 2) + '</td></tr>';
+                numberTable += '<tr><td><b>' + PMA_messages.strTotalTime + '</b></td><td>' + PMA_prettyProfilingNum(totalTime, 2) + '</td></tr>';
                 numberTable += '</tbody></table>';
 
                 $('#queryAnalyzerDialog div.placeHolder td.chart').append(
-                    '<b>' + PMA_messages['strProfilingResults'] + ' ' + $('#profiling_docu').html() + '</b> ' +
-                    '(<a href="#showNums">' + PMA_messages['strTable'] + '</a>, <a href="#showChart">' + PMA_messages['strChart'] + '</a>)<br/>' +
+                    '<b>' + PMA_messages.strProfilingResults + ' ' + $('#profiling_docu').html() + '</b> ' +
+                    '(<a href="#showNums">' + PMA_messages.strTable + '</a>, <a href="#showChart">' + PMA_messages['strChart'] + '</a>)<br/>' +
                     numberTable + ' <div id="queryProfiling"></div>');
 
                 $('#queryAnalyzerDialog div.placeHolder a[href="#showNums"]').click(function () {
@@ -2212,13 +2212,13 @@ AJAX.registerOnload('server_status_monitor.js', function () {
 
 function serverResponseError() {
     var btns = {};
-    btns[PMA_messages['strReloadPage']] = function () {
+    btns[PMA_messages.strReloadPage] = function () {
         window.location.reload();
     };
-    $('#emptyDialog').dialog({title: PMA_messages['strRefreshFailed']});
+    $('#emptyDialog').dialog({title: PMA_messages.strRefreshFailed});
     $('#emptyDialog').html(
         PMA_getImage('s_attention.png') +
-        PMA_messages['strInvalidResponseExplanation']
+        PMA_messages.strInvalidResponseExplanation
     );
     $('#emptyDialog').dialog({ buttons: btns });
 }
diff --git a/js/server_status_queries.js b/js/server_status_queries.js
index 51bb155347..9939105d24 100644
--- a/js/server_status_queries.js
+++ b/js/server_status_queries.js
@@ -34,7 +34,7 @@ AJAX.registerOnload('server_status_queries.js', function () {
     PMA_tooltip(
         $('table.sortable>thead>tr:first').find('th'),
         'th',
-        PMA_messages['strSortHint']
+        PMA_messages.strSortHint
     );
     initTableSorter('statustabs_queries');
 });
diff --git a/js/server_status_sorter.js b/js/server_status_sorter.js
index 1713191539..53330402e2 100644
--- a/js/server_status_sorter.js
+++ b/js/server_status_sorter.js
@@ -37,8 +37,8 @@ $(function () {
         },
         format: function (s) {
             var num = jQuery.tablesorter.formatFloat(
-                s.replace(PMA_messages['strThousandsSeparator'], '')
-                 .replace(PMA_messages['strDecimalSeparator'], '.')
+                s.replace(PMA_messages.strThousandsSeparator, '')
+                 .replace(PMA_messages.strDecimalSeparator, '.')
             );
 
             var factor = 1;
diff --git a/js/server_status_variables.js b/js/server_status_variables.js
index 1be718ab57..0b006c70b3 100644
--- a/js/server_status_variables.js
+++ b/js/server_status_variables.js
@@ -20,7 +20,7 @@ AJAX.registerOnload('server_status_variables.js', function () {
     PMA_tooltip(
         $('table.sortable>thead>tr:first').find('th'),
         'th',
-        PMA_messages['strSortHint']
+        PMA_messages.strSortHint
     );
     initTableSorter('statustabs_allvars');
 
diff --git a/js/sql.js b/js/sql.js
index 3fd6f2b08f..cdf06690d3 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -106,7 +106,7 @@ AJAX.registerOnload('sql.js', function () {
     // Delete row from SQL results
     $('a.delete_row.ajax').click(function (e) {
         e.preventDefault();
-        var question = $.sprintf(PMA_messages['strDoYouReally'], $(this).closest('td').find('div').text());
+        var question = $.sprintf(PMA_messages.strDoYouReally, $(this).closest('td').find('div').text());
         var $link = $(this);
         $link.PMA_confirm(question, $link.attr('href'), function (url) {
             $msgbox = PMA_ajaxShowMessage();
@@ -159,7 +159,7 @@ AJAX.registerOnload('sql.js', function () {
     // do not add this link more than once
     if (! $('#sqlqueryform').find('a').is('#togglequerybox')) {
         $('<a id="togglequerybox"></a>')
-        .html(PMA_messages['strHideQueryBox'])
+        .html(PMA_messages.strHideQueryBox)
         .appendTo("#sqlqueryform")
         // initially hidden because at this point, nothing else
         // appears under the link
@@ -169,14 +169,14 @@ AJAX.registerOnload('sql.js', function () {
         $("#togglequerybox").bind('click', function () {
             var $link = $(this);
             $link.siblings().slideToggle("fast");
-            if ($link.text() == PMA_messages['strHideQueryBox']) {
-                $link.text(PMA_messages['strShowQueryBox']);
+            if ($link.text() == PMA_messages.strHideQueryBox) {
+                $link.text(PMA_messages.strShowQueryBox);
                 // cheap trick to add a spacer between the menu tabs
                 // and "Show query box"; feel free to improve!
                 $('#togglequerybox_spacer').remove();
                 $link.before('<br id="togglequerybox_spacer" />');
             } else {
-                $link.text(PMA_messages['strHideQueryBox']);
+                $link.text(PMA_messages.strHideQueryBox);
             }
             // avoid default click action
             return false;
@@ -373,12 +373,12 @@ AJAX.registerOnload('sql.js', function () {
              */
             var button_options = {};
             // in the following function we need to use $(this)
-            button_options[PMA_messages['strCancel']] = function () {
+            button_options[PMA_messages.strCancel] = function () {
                 $(this).dialog('close');
             };
 
             var button_options_error = {};
-            button_options_error[PMA_messages['strOK']] = function () {
+            button_options_error[PMA_messages.strOK] = function () {
                 $(this).dialog('close');
             };
             var $form = $("#resultsForm");
@@ -390,7 +390,7 @@ AJAX.registerOnload('sql.js', function () {
                     $div
                     .append(data.error)
                     .dialog({
-                        title: PMA_messages['strChangeTbl'],
+                        title: PMA_messages.strChangeTbl,
                         height: 230,
                         width: 900,
                         open: PMA_verifyColumnsProperties,
@@ -403,7 +403,7 @@ AJAX.registerOnload('sql.js', function () {
                     $div
                     .append(data.message)
                     .dialog({
-                        title: PMA_messages['strChangeTbl'],
+                        title: PMA_messages.strChangeTbl,
                         height: 600,
                         width: 900,
                         open: PMA_verifyColumnsProperties,
@@ -421,7 +421,7 @@ AJAX.registerOnload('sql.js', function () {
                 PMA_ajaxRemoveMessage($msgbox);
             }); // end $.get()
         } else {
-            PMA_ajaxShowMessage(PMA_messages['strNoRowSelected']);
+            PMA_ajaxShowMessage(PMA_messages.strNoRowSelected);
         }
     });
 
diff --git a/js/tbl_change.js b/js/tbl_change.js
index 6e1d6a842f..94e9245b9f 100644
--- a/js/tbl_change.js
+++ b/js/tbl_change.js
@@ -434,7 +434,7 @@ AJAX.registerOnload('tbl_change.js', function () {
                 if (curr_rows == 1) {
                     $('<input id="insert_ignore_1" type="checkbox" name="insert_ignore_1" checked="checked" />')
                     .insertBefore("table.insertRowTable:last")
-                    .after('<label for="insert_ignore_1">' + PMA_messages['strIgnore'] + '</label>');
+                    .after('<label for="insert_ignore_1">' + PMA_messages.strIgnore + '</label>');
                 } else {
 
                     /**
diff --git a/js/tbl_chart.js b/js/tbl_chart.js
index 6febba9fbe..c555a6dc35 100644
--- a/js/tbl_chart.js
+++ b/js/tbl_chart.js
@@ -126,7 +126,7 @@ AJAX.registerOnload('tbl_chart.js', function () {
                 $('input#radio_line').prop('checked', true);
                 currentSettings.type = 'line';
             }
-            yaxis_title = PMA_messages['strYValues'];
+            yaxis_title = PMA_messages.strYValues;
         }
         $('input[name="yaxis_label"]').val(yaxis_title);
         currentSettings.yaxisLabel = yaxis_title;
@@ -151,8 +151,8 @@ AJAX.registerOnload('tbl_chart.js', function () {
  *
  */
 $("#tblchartform").live('submit', function (event) {
-    if (!checkFormElementInRange(this, 'session_max_rows', PMA_messages['strNotValidRowNumber'], 1)
-        || !checkFormElementInRange(this, 'pos', PMA_messages['strNotValidRowNumber'], 0 - 1)) {
+    if (!checkFormElementInRange(this, 'session_max_rows', PMA_messages.strNotValidRowNumber, 1)
+        || !checkFormElementInRange(this, 'pos', PMA_messages.strNotValidRowNumber, 0 - 1)) {
         return false;
     }
 
diff --git a/js/tbl_select.js b/js/tbl_select.js
index 15b2fede51..373777b1a2 100644
--- a/js/tbl_select.js
+++ b/js/tbl_select.js
@@ -34,14 +34,14 @@ AJAX.registerOnload('tbl_select.js', function () {
      .hide();
 
     $('#togglesearchformlink')
-        .html(PMA_messages['strShowSearchCriteria'])
+        .html(PMA_messages.strShowSearchCriteria)
         .bind('click', function () {
             var $link = $(this);
             $('#tbl_search_form').slideToggle();
-            if ($link.text() == PMA_messages['strHideSearchCriteria']) {
-                $link.text(PMA_messages['strShowSearchCriteria']);
+            if ($link.text() == PMA_messages.strHideSearchCriteria) {
+                $link.text(PMA_messages.strShowSearchCriteria);
             } else {
-                $link.text(PMA_messages['strHideSearchCriteria']);
+                $link.text(PMA_messages.strHideSearchCriteria);
             }
             // avoid default click action
             return false;
@@ -64,7 +64,7 @@ AJAX.registerOnload('tbl_select.js', function () {
 
         // empty previous search results while we are waiting for new results
         $("#sqlqueryresults").empty();
-        var $msgbox = PMA_ajaxShowMessage(PMA_messages['strSearching'], false);
+        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strSearching, false);
 
         PMA_prepareForAjaxRequest($search_form);
 
@@ -119,7 +119,7 @@ AJAX.registerOnload('tbl_select.js', function () {
                  .hide();
                 $('#togglesearchformlink')
                  // always start with the Show message
-                 .text(PMA_messages['strShowSearchCriteria']);
+                 .text(PMA_messages.strShowSearchCriteria);
                 $('#togglesearchformdiv')
                  // now it's time to show the div containing the link
                  .show();
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 4182e4a297..f500b8b7b6 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -111,7 +111,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
                     .insertBefore('#page_content');
                 PMA_verifyColumnsProperties();
             } else {
-                PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
+                PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
             }
         });
     });
@@ -131,7 +131,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
                     .insertBefore('#page_content');
                 PMA_verifyColumnsProperties();
             } else {
-                PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
+                PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
             }
         });
     });
@@ -160,9 +160,9 @@ AJAX.registerOnload('tbl_structure.js', function () {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = $.sprintf(PMA_messages['strDoYouReally'], 'ALTER TABLE `' + escapeHtml(curr_table_name) + '` DROP `' + escapeHtml(curr_column_name) + '`;');
+        var question = $.sprintf(PMA_messages.strDoYouReally, 'ALTER TABLE `' + escapeHtml(curr_table_name) + '` DROP `' + escapeHtml(curr_column_name) + '`;');
         $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
-            var $msg = PMA_ajaxShowMessage(PMA_messages['strDroppingColumn'], false);
+            var $msg = PMA_ajaxShowMessage(PMA_messages.strDroppingColumn, false);
             $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function (data) {
                 if (data.success === true) {
                     PMA_ajaxRemoveMessage($msg);
@@ -186,7 +186,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
                     $('#indexes').html(data.indexes_list);
                     PMA_reloadNavigation();
                 } else {
-                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
+                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
                 }
             }); // end $.get()
         }); // end $.PMA_confirm()
@@ -208,9 +208,9 @@ AJAX.registerOnload('tbl_structure.js', function () {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = $.sprintf(PMA_messages['strDoYouReally'], 'ALTER TABLE `' + escapeHtml(curr_table_name) + '` ADD PRIMARY KEY(`' + escapeHtml(curr_column_name) + '`);');
+        var question = $.sprintf(PMA_messages.strDoYouReally, 'ALTER TABLE `' + escapeHtml(curr_table_name) + '` ADD PRIMARY KEY(`' + escapeHtml(curr_column_name) + '`);');
         $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
-            var $msg = PMA_ajaxShowMessage(PMA_messages['strAddingPrimaryKey'], false);
+            var $msg = PMA_ajaxShowMessage(PMA_messages.strAddingPrimaryKey, false);
             $.get(url, {'is_js_confirmed' : 1, 'ajax_request' : true}, function (data) {
                 if (data.success === true) {
                     PMA_ajaxRemoveMessage($msg);
@@ -229,7 +229,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
                         PMA_reloadNavigation();
                     }
                 } else {
-                    PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false);
+                    PMA_ajaxShowMessage(PMA_messages.strErrorProcessingRequest + " : " + data.error, false);
                 }
             }); // end $.get()
         }); // end $.PMA_confirm()
@@ -251,7 +251,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
          */
         var button_options = {};
 
-        button_options[PMA_messages['strGo']] = function (event) {
+        button_options[PMA_messages.strGo] = function (event) {
             event.preventDefault();
             var $msgbox = PMA_ajaxShowMessage();
             var $this = $(this);
@@ -309,12 +309,12 @@ AJAX.registerOnload('tbl_structure.js', function () {
                 }
             });
         };
-        button_options[PMA_messages['strCancel']] = function () {
+        button_options[PMA_messages.strCancel] = function () {
             $(this).dialog('close');
         };
 
         var button_options_error = {};
-        button_options_error[PMA_messages['strOK']] = function () {
+        button_options_error[PMA_messages.strOK] = function () {
             $(this).dialog('close').remove();
         };
 
diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js
index a287b23da0..0f319c8de8 100644
--- a/js/tbl_zoom_plot_jqplot.js
+++ b/js/tbl_zoom_plot_jqplot.js
@@ -12,7 +12,7 @@
  **  Display Help/Info
  **/
 function displayHelp() {
-    PMA_ajaxShowMessage(PMA_messages['strDisplayHelp'], 10000);
+    PMA_ajaxShowMessage(PMA_messages.strDisplayHelp, 10000);
 }
 
 /**
@@ -237,9 +237,9 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
      **/
     $('#inputFormSubmitId').click(function () {
         if ($('#tableid_0').get(0).selectedIndex === 0 || $('#tableid_1').get(0).selectedIndex === 0) {
-            PMA_ajaxShowMessage(PMA_messages['strInputNull']);
+            PMA_ajaxShowMessage(PMA_messages.strInputNull);
         } else if (xLabel == yLabel) {
-            PMA_ajaxShowMessage(PMA_messages['strSameInputs']);
+            PMA_ajaxShowMessage(PMA_messages.strSameInputs);
         }
     });
 
@@ -253,14 +253,14 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
         .hide();
 
     $('#togglesearchformlink')
-        .html(PMA_messages['strShowSearchCriteria'])
+        .html(PMA_messages.strShowSearchCriteria)
         .bind('click', function () {
             var $link = $(this);
             $('#zoom_search_form').slideToggle();
-            if ($link.text() == PMA_messages['strHideSearchCriteria']) {
-                $link.text(PMA_messages['strShowSearchCriteria']);
+            if ($link.text() == PMA_messages.strHideSearchCriteria) {
+                $link.text(PMA_messages.strShowSearchCriteria);
             } else {
-                $link.text(PMA_messages['strHideSearchCriteria']);
+                $link.text(PMA_messages.strHideSearchCriteria);
             }
             // avoid default click action
             return false;
@@ -273,7 +273,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
     /*
      * Handle saving of a row in the editor
      */
-    buttonOptions[PMA_messages['strSave']] = function () {
+    buttonOptions[PMA_messages.strSave] = function () {
         //Find changed values by comparing form values with selectedRow Object
         var newValues = {};//Stores the values changed from original
         var sqlTypes = {};
@@ -397,12 +397,12 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
         }//End database update
         $("#dataDisplay").dialog('close');
     };
-    buttonOptions[PMA_messages['strCancel']] = function () {
+    buttonOptions[PMA_messages.strCancel] = function () {
         $(this).dialog('close');
     };
     $("#dataDisplay").dialog({
         autoOpen: false,
-        title: PMA_messages['strDataPointContent'],
+        title: PMA_messages.strDataPointContent,
         modal: true,
         buttons: buttonOptions,
         width: $('#dataDisplay').width() + 80,
@@ -418,8 +418,8 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
     $("#dataDisplay").find(':input').live('keydown', function (e) {
         if (e.which === 13) { // 13 is the ENTER key
             e.preventDefault();
-            if (typeof buttonOptions[PMA_messages['strSave']] === 'function') {
-                buttonOptions[PMA_messages['strSave']].call();
+            if (typeof buttonOptions[PMA_messages.strSave] === 'function') {
+                buttonOptions[PMA_messages.strSave].call();
             }
         }
     });
@@ -434,7 +434,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
          .slideToggle()
          .hide();
         $('#togglesearchformlink')
-         .text(PMA_messages['strShowSearchCriteria']);
+         .text(PMA_messages.strShowSearchCriteria);
         $('#togglesearchformdiv').show();
         var selectedRow;
         var colorCodes = ['#FF0000', '#00FFFF', '#0000FF', '#0000A0', '#FF0080', '#800080', '#FFFF00', '#00FF00', '#FF00FF'];