patch #2649087 None default is different than other None in some languages.

ChangeLog

@@ -41,6 +41,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + rfe #1369509 Link to download more themes.
 + rfe #1666487 Add option to generate password on change password page.
 + rfe #1694104 Allow logging of user status with Apache.
+- patch #2649087 None default is different than other None in some languages.
 
 3.1.4.0 (not yet released)
 + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ,

lang/afrikaans-utf-8.inc.php

@@ -1476,4 +1476,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/albanian-utf-8.inc.php

@@ -1475,4 +1475,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/arabic-utf-8.inc.php

@@ -1477,4 +1477,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/azerbaijani-utf-8.inc.php

@@ -1472,4 +1472,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/bangla-utf-8.inc.php

@@ -1451,4 +1451,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/basque-utf-8.inc.php

@@ -1469,4 +1469,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/belarusian_cyrillic-utf-8.inc.php

@@ -1451,4 +1451,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/belarusian_latin-utf-8.inc.php

@@ -1459,4 +1459,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/bosnian-utf-8.inc.php

@@ -1475,4 +1475,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/brazilian_portuguese-utf-8.inc.php

@@ -1449,4 +1449,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/bulgarian-utf-8.inc.php

@@ -1472,4 +1472,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/catalan-utf-8.inc.php

@@ -1449,4 +1449,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/chinese_simplified-utf-8.inc.php

@@ -1477,4 +1477,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/chinese_traditional-utf-8.inc.php

@@ -1456,4 +1456,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/croatian-utf-8.inc.php

@@ -1453,4 +1453,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/czech-utf-8.inc.php

@@ -523,6 +523,7 @@ $strNoIndex = 'Není definován žádný index!';
 $strNoIndexPartsDefined = 'Nebyla zadána žádná část indexu!';
 $strNoModification = 'Žádná změna';
 $strNo = 'Ne';
+$strNoneDefault = 'Žádná';
 $strNone = 'Žádná';
 $strNoOptions = 'Tento formát nemá žádná nastavení';
 $strNoPassword = 'Žádné heslo';

lang/danish-utf-8.inc.php

@@ -1451,4 +1451,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/dutch-utf-8.inc.php

@@ -1458,4 +1458,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/english-utf-8.inc.php

@@ -523,6 +523,7 @@ $strNoFrames = 'phpMyAdmin is more friendly with a <b>frames-capable</b> browser
 $strNoIndex = 'No index defined!';
 $strNoIndexPartsDefined = 'No index parts defined!';
 $strNoModification = 'No change';
+$strNoneDefault = 'None';
 $strNone = 'None';
 $strNo = 'No';
 $strNoOptions = 'This format has no options';

lang/estonian-utf-8.inc.php

@@ -1457,4 +1457,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/finnish-utf-8.inc.php

@@ -1452,4 +1452,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/french-utf-8.inc.php

@@ -1448,4 +1448,5 @@ $strZip = '"zippé"';
 
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/galician-utf-8.inc.php

@@ -1450,4 +1450,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/georgian-utf-8.inc.php

@@ -1456,4 +1456,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/greek-utf-8.inc.php

@@ -1474,4 +1474,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/hebrew-utf-8.inc.php

@@ -1469,4 +1469,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/hindi-utf-8.inc.php

@@ -1477,4 +1477,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/hungarian-utf-8.inc.php

@@ -1454,4 +1454,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/indonesian-utf-8.inc.php

@@ -1467,4 +1467,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/italian-utf-8.inc.php

@@ -1456,4 +1456,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/japanese-utf-8.inc.php

@@ -1457,4 +1457,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/korean-utf-8.inc.php

@@ -1472,4 +1472,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/latvian-utf-8.inc.php

@@ -1474,4 +1474,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/lithuanian-utf-8.inc.php

@@ -1466,4 +1466,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/macedonian_cyrillic-utf-8.inc.php

@@ -1452,4 +1452,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/malay-utf-8.inc.php

@@ -1489,4 +1489,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/mongolian-utf-8.inc.php

@@ -1472,4 +1472,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/norwegian-utf-8.inc.php

@@ -1449,4 +1449,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/persian-utf-8.inc.php

@@ -1503,4 +1503,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/polish-utf-8.inc.php

@@ -1445,4 +1445,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/portuguese-utf-8.inc.php

@@ -1478,4 +1478,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/romanian-utf-8.inc.php

@@ -1458,4 +1458,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/russian-utf-8.inc.php

@@ -1462,4 +1462,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/serbian_cyrillic-utf-8.inc.php

@@ -1451,4 +1451,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/serbian_latin-utf-8.inc.php

@@ -1451,4 +1451,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/sinhala-utf-8.inc.php

@@ -1454,4 +1454,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/slovak-utf-8.inc.php

@@ -1452,4 +1452,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/slovenian-utf-8.inc.php

@@ -1471,4 +1471,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/spanish-utf-8.inc.php

@@ -1447,4 +1447,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/swedish-utf-8.inc.php

@@ -1449,4 +1449,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/tatarish-utf-8.inc.php

@@ -1462,4 +1462,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/thai-utf-8.inc.php

@@ -1473,4 +1473,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/turkish-utf-8.inc.php

@@ -1455,4 +1455,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

lang/ukrainian-utf-8.inc.php

@@ -1471,4 +1471,5 @@ $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a
 $strSetupServers_AllowNoPassword_name = 'Allow logins without a password';  //to translate
 $strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.';  //to translate
 $strGetMoreThemes = 'Get more themes!';  //to translate
+$strNoneDefault = 'None';  //to translate
 ?>

libraries/tbl_properties.inc.php

@@ -383,7 +383,7 @@ for ($i = 0; $i < $num_fields; $i++) {
     // users would have problems if they forget to enter the default
     // value (example, for an INT)
     $default_options = array(
-        'NONE'              =>  $strNone,
+        'NONE'              =>  $strNoneDefault,
         'USER_DEFINED'      =>  $strAsDefined,
         'NULL'              => 'NULL',
         'CURRENT_TIMESTAMP' => 'CURRENT_TIMESTAMP',

tbl_structure.php

@@ -343,7 +343,7 @@ while ($row = PMA_DBI_fetch_assoc($fields_rs)) {
         }
     }
     else {
-        echo '<i>' . $strNone . '</i>';
+        echo '<i>' . $strNoneDefault . '</i>';
     } ?></td>
     <td nowrap="nowrap"><?php echo $row['Extra']; ?></td>
     <td align="center">