diff --git a/libraries/messages.inc.php b/libraries/messages.inc.php
index c5f3531ec..37f8310d3 100644
--- a/libraries/messages.inc.php
+++ b/libraries/messages.inc.php
@@ -15,9 +15,9 @@ $byteUnits = array(__('B'), __('KiB'), __('MiB'), __('GiB'), __('TiB'), __('PiB'
 
 // MySQL manual language definition, this is optional, en will be used
 // if not defined
-$mysql_4_1_doc_lang = __('en');
-$mysql_5_0_doc_lang = __('en');
-$mysql_5_1_doc_lang = __('en');
+$mysql_4_1_doc_lang = _pgettext('$mysql_4_1_doc_lang', 'en');
+$mysql_5_0_doc_lang = _pgettext('$mysql_5_0_doc_lang', 'en');
+$mysql_5_1_doc_lang = _pgettext('$mysql_5_1_doc_lang', 'en');
 
 $day_of_week = array(__('Sun'), __('Mon'), __('Tue'), __('Wed'), __('Thu'), __('Fri'), __('Sat'));
 $month = array(__('Jan'), __('Feb'), __('Mar'), __('Apr'), __('May'), __('Jun'), __('Jul'), __('Aug'), __('Sep'), __('Oct'), __('Nov'), __('Dec'));
@@ -95,13 +95,13 @@ $strBinLogServerId = __('Server ID');
 $strBLOBRepository = __('BLOB Repository');
 $strBLOBRepositoryDamaged = __('Damaged');
 $strBLOBRepositoryDisableAreYouSure = __('Are you sure you want to disable all BLOB references for database %s?');
-$strBLOBRepositoryDisabled = __('Disabled');
+$strBLOBRepositoryDisabled = _pgettext('$strBLOBRepositoryDisabled', 'Disabled');
 $strBLOBRepositoryDisable = __('Disable');
 $strBLOBRepositoryDisableStrongWarning = __('You are about to DISABLE a BLOB Repository!');
-$strBLOBRepositoryEnabled = __('Enabled');
+$strBLOBRepositoryEnabled = _pgettext('$strBLOBRepositoryEnabled', 'Enabled');
 $strBLOBRepositoryEnable = __('Enable');
 $strBLOBRepositoryRemove = __('Remove BLOB Repository Reference');
-$strBLOBRepositoryRepair = __('Repair');
+$strBLOBRepositoryRepair = _pgettext('$strBLOBRepositoryRepair', 'Repair');
 $strBLOBRepositoryUpload = __('Upload to BLOB repository');
 $strBookmarkAllUsers = __('Let every user access this bookmark');
 $strBookmarkCreated = __('Bookmark %s created');
@@ -202,7 +202,7 @@ $strCreateTable  = __('Create table');
 $strCreateTableShort = __('Create table');
 $strCreateUserDatabase = __('Database for user');
 $strCreateUserDatabaseName = __('Create database with same name and grant all privileges');
-$strCreateUserDatabaseNone = __('None');
+$strCreateUserDatabaseNone = _pgettext('$strCreateUserDatabaseNone', 'None');
 $strCreateUserDatabasePrivileges = __('Grant all privileges on database "%s"');
 $strCreateUserDatabaseWildcard = __('Grant all privileges on wildcard name (username\_%)');
 $strCreationDates = __('Creation/Update/Check dates');
@@ -570,7 +570,7 @@ $strNoFrames = __('phpMyAdmin is more friendly with a <b>frames-capable</b> brow
 $strNoIndex = __('No index defined!');
 $strNoIndexPartsDefined = __('No index parts defined!');
 $strNoModification = __('No change');
-$strNoneDefault = __('None');
+$strNoneDefault = _pgettext('$strNoneDefault', 'None');
 $strNone = __('None');
 $strNo = __('No');
 $strNoOptions = __('This format has no options');
@@ -1413,7 +1413,7 @@ $strStatus = __('Status');
 $strStop = __('Stop');
 $strStorageEngines = __('Storage Engines');
 $strStorageEngine = __('Storage Engine');
-$strStrucCSV = __('CSV');
+$strStrucCSV = _pgettext('$strStrucCSV', 'CSV');
 $strStrucData = __('Structure and data');
 $strStrucExcelCSV = __('CSV for MS Excel');
 $strStrucNativeExcel = __('Native MS Excel format');