libraries/common.lib.php3, main.php3:

- Final solution to bug #582890
 lang/*:
  - String for localization used in auto-generation of names

lang/afrikaans-iso-8859-1.inc.php3

@@ -433,4 +433,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/afrikaans-utf-8.inc.php3

@@ -434,4 +434,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/albanian-iso-8859-1.inc.php3

@@ -432,4 +432,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/albanian-utf-8.inc.php3

@@ -433,4 +433,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/arabic-utf-8.inc.php3

@@ -448,4 +448,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/arabic-windows-1256.inc.php3

@@ -447,4 +447,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/brazilian_portuguese-iso-8859-1.inc.php3

@@ -447,4 +447,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/brazilian_portuguese-utf-8.inc.php3

@@ -448,4 +448,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/bulgarian-koi8-r.inc.php3

@@ -447,4 +447,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/bulgarian-utf-8.inc.php3

@@ -448,4 +448,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/bulgarian-windows-1251.inc.php3

@@ -447,4 +447,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/catalan-iso-8859-1.inc.php3

@@ -434,4 +434,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/catalan-utf-8.inc.php3

@@ -435,4 +435,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/chinese_big5-utf-8.inc.php3

@@ -434,4 +434,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/chinese_big5.inc.php3

@@ -433,4 +433,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/chinese_gb-utf-8.inc.php3

@@ -433,4 +433,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/chinese_gb.inc.php3

@@ -431,4 +431,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/croatian-iso-8859-2.inc.php3

@@ -446,4 +446,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/croatian-utf-8.inc.php3

@@ -447,4 +447,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/croatian-windows-1250.inc.php3

@@ -446,4 +446,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/czech-iso-8859-2.inc.php3

@@ -432,4 +432,5 @@ $strYes = 'Ano';
 $strZip = '"zazipov<6F>no"';
 // To translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/czech-utf-8.inc.php3

@@ -433,4 +433,5 @@ $strYes = 'Ano';
 $strZip = '"zazipováno"';
 // To translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/czech-windows-1250.inc.php3

@@ -432,4 +432,5 @@ $strYes = 'Ano';
 $strZip = '"zazipov<6F>no"';
 // To translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/danish-iso-8859-1.inc.php3

@@ -441,4 +441,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/danish-utf-8.inc.php3

@@ -442,4 +442,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/dutch-iso-8859-1.inc.php3

@@ -430,4 +430,5 @@ $strYes = 'Ja';
 
 $strZip = '"Gezipt"';
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/dutch-utf-8.inc.php3

@@ -431,4 +431,5 @@ $strYes = 'Ja';
 
 $strZip = '"Gezipt"';
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/english-iso-8859-1.inc.php3

@@ -340,6 +340,7 @@ $strSelectFields = 'Select fields (at least one):';
 $strSelectNumRows = 'in query';
 $strSelectTables = 'Select Tables';
 $strSend = 'Save as file';
+$strServer = 'Server %s';
 $strServerChoice = 'Server Choice';
 $strServerVersion = 'Server version';
 $strSetEnumVal = 'If field type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').';

lang/english-utf-8.inc.php3

@@ -341,6 +341,7 @@ $strSelectFields = 'Select fields (at least one):';
 $strSelectNumRows = 'in query';
 $strSelectTables = 'Select Tables';
 $strSend = 'Save as file';
+$strServer = 'Server %s';
 $strServerChoice = 'Server Choice';
 $strServerVersion = 'Server version';
 $strSetEnumVal = 'If field type is "enum" or "set", please enter the values using this format: \'a\',\'b\',\'c\'...<br />If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').';

lang/estonian-iso-8859-1.inc.php3

@@ -427,4 +427,5 @@ $strYes = 'Jah';
 $strZip = '"zipitud"';
 // To translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/estonian-utf-8.inc.php3

@@ -428,4 +428,5 @@ $strYes = 'Jah';
 $strZip = '"zipitud"';
 // To translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/finnish-iso-8859-1.inc.php3

@@ -430,4 +430,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/finnish-utf-8.inc.php3

@@ -431,4 +431,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/french-iso-8859-1.inc.php3

@@ -428,4 +428,5 @@ $strZip = '"zipp
 // To translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/french-utf-8.inc.php3

@@ -429,4 +429,5 @@ $strZip = '"zippé"';
 // To translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/galician-iso-8859-1.inc.php3

@@ -434,4 +434,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/galician-utf-8.inc.php3

@@ -435,4 +435,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/georgian-utf-8.inc.php3

@@ -446,4 +446,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/german-iso-8859-1.inc.php3

@@ -435,4 +435,5 @@ $strYes = 'Ja';
 $strZip = 'Zip-komprimiert';
 // To translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/german-utf-8.inc.php3

@@ -436,4 +436,5 @@ $strYes = 'Ja';
 $strZip = 'Zip-komprimiert';
 // To translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/greek-iso-8859-7.inc.php3

@@ -445,4 +445,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/greek-utf-8.inc.php3

@@ -446,4 +446,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/hebrew-iso-8859-8-i.inc.php3

@@ -443,4 +443,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/hindi-utf-8.inc.php3

@@ -456,4 +456,5 @@ $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 
 $strZip = '"zipped"' ;  //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/hungarian-iso-8859-2.inc.php3

@@ -431,4 +431,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/hungarian-utf-8.inc.php3

@@ -432,4 +432,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/indonesian-iso-8859-1.inc.php3

@@ -429,4 +429,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/indonesian-utf-8.inc.php3

@@ -430,4 +430,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/italian-iso-8859-1.inc.php3

@@ -433,4 +433,5 @@ $strYes = ' Si ';
 $strZip = '"compresso con zip"';
 
 // To translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/italian-utf-8.inc.php3

@@ -434,4 +434,5 @@ $strYes = ' Si ';
 $strZip = '"compresso con zip"';
 
 // To translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/japanese-euc.inc.php3

@@ -436,4 +436,5 @@ $strXkana = '
 $strYes = '<27>Ϥ<EFBFBD>';
 
 $strZip = '"zip<69><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"';
+$strServer = 'Server %s';  //to translate
 ?>

lang/japanese-sjis.inc.php3

@@ -435,4 +435,5 @@ $strXkana = '
 $strYes = '<27>͂<EFBFBD>';
 
 $strZip = '"zip<69><70><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"';
+$strServer = 'Server %s';  //to translate
 ?>

lang/japanese-utf-8.inc.php3

@@ -1,4 +1,5 @@
 <?php
+
 /* $Id$ */
 
 /**
@@ -6,6 +7,7 @@
  */
 
 $charset = 'utf-8';
+$allow_recoding = TRUE;
 $text_dir = 'ltr';
 $left_font_family = 'verdana, arial, helvetica, geneva, sans-serif';
 $right_font_family = 'arial, helvetica, geneva, sans-serif';
@@ -367,7 +369,7 @@ $strSort = 'ソート';
 $strSpaceUsage = 'ディスク使用量';
 $strSplitWordsWithSpace = '各単語はスペース文字(" ")で区切って下さい';
 $strSQL = 'SQL';
-$strSQLParserBugMessage = 'あなたはSQLパーサーでバグを見つけられるかもしれません。あなたのクエリーを念入りに確かめて、引用符が正しくミスマッチがないかチェックしましょう。その他の失敗にはテキストエリアで引用した外側にバイナリ－コードが付いてファイルがアップロードされてしまったような原因が考えられます。また、あなたのクエリーをMySQLのコマンドラインを使って試すことも出来ます。MySQLサーバーは以下のようにエラーを出します。そこには問題を解決する手助けがあるでしょう。コマンドラインでは成功しても、まだ問題がある場合、パーサーが失敗する場合には、問題のあるSQLクエリーをひとつの文に減らしてみて下さい。そして以下のセクションでデータを切り取ってBUG報告を送って下さい:';
+$strSQLParserBugMessage = 'あなたはSQLパーサーでバグを見つけられるかもしれません。あなたのクエリーを念入りに確かめて、引用符が正しくミスマッチがないかチェックしましょう。その他の失敗にはテキストエリアで引用した外側にバイナリ−コードが付いてファイルがアップロードされてしまったような原因が考えられます。また、あなたのクエリーをMySQLのコマンドラインを使って試すことも出来ます。MySQLサーバーは以下のようにエラーを出します。そこには問題を解決する手助けがあるでしょう。コマンドラインでは成功しても、まだ問題がある場合、パーサーが失敗する場合には、問題のあるSQLクエリーをひとつの文に減らしてみて下さい。そして以下のセクションでデータを切り取ってBUG報告を送って下さい:';
 $strSQLParserUserError = 'あなたのSQLクエリーにエラーがあります。MySQLサーバーは以下のようにエラーを出します。そこには問題を解決する手助けがあるでしょう。';
 $strSQLQuery = '実行されたSQLクエリー';
 $strSQLResult = 'SQLの結果';
@@ -435,4 +437,5 @@ $strXkana = '全角カナへ変換する'; // convert to X208-kana
 $strYes = 'はい';
 
 $strZip = '"zipされる"';
+$strServer = 'Server %s';  //to translate
 ?>

lang/korean-ks_c_5601-1987.inc.php3

@@ -446,4 +446,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/latvian-utf-8.inc.php3

@@ -447,4 +447,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/latvian-windows-1257.inc.php3

@@ -446,4 +446,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/lithuanian-utf-8.inc.php3

@@ -434,4 +434,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/lithuanian-windows-1257.inc.php3

@@ -433,4 +433,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/malay-iso-8859-1.inc.php3

@@ -448,4 +448,5 @@ $strZip = '"zipped"';
 
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/malay-utf-8.inc.php3

@@ -449,4 +449,5 @@ $strZip = '"zipped"';
 
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/norwegian-iso-8859-1.inc.php3

@@ -432,4 +432,5 @@ $strSQLParserBugMessage = 'There is a chance that you may have found a bug in th
 $strSQPBugInvalidIdentifer = 'Invalid Identifer';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/norwegian-utf-8.inc.php3

@@ -433,4 +433,5 @@ $strSQLParserBugMessage = 'There is a chance that you may have found a bug in th
 $strSQPBugInvalidIdentifer = 'Invalid Identifer';  //to translate
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';  //to translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/polish-iso-8859-2.inc.php3

@@ -427,4 +427,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/polish-utf-8.inc.php3

@@ -428,4 +428,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/portuguese-iso-8859-1.inc.php3

@@ -438,4 +438,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/portuguese-utf-8.inc.php3

@@ -439,4 +439,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/romanian-iso-8859-1.inc.php3

@@ -427,4 +427,5 @@ $strYes = 'Da';
 $strZip = '"arhivat"';
 // To translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/romanian-utf-8.inc.php3

@@ -428,4 +428,5 @@ $strYes = 'Da';
 $strZip = '"arhivat"';
 // To translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/russian-koi8-r.inc.php3

@@ -437,4 +437,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/russian-utf-8.inc.php3

@@ -438,4 +438,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/russian-windows-1251.inc.php3

@@ -437,4 +437,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/serbian-utf-8.inc.php3

@@ -449,4 +449,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/serbian-windows-1250.inc.php3

@@ -448,4 +448,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/slovak-iso-8859-2.inc.php3

@@ -429,4 +429,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/slovak-utf-8.inc.php3

@@ -430,4 +430,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/slovak-windows-1250.inc.php3

@@ -429,4 +429,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/slovenian-iso-8859-2.inc.php3

@@ -431,4 +431,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/slovenian-utf-8.inc.php3

@@ -432,4 +432,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/slovenian-windows-1250.inc.php3

@@ -431,4 +431,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/spanish-iso-8859-1.inc.php3

@@ -428,4 +428,5 @@ $strValidatorError = 'The SQL validator could not be initialized. Please check i
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/spanish-utf-8.inc.php3

@@ -429,4 +429,5 @@ $strValidatorError = 'The SQL validator could not be initialized. Please check i
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/swedish-iso-8859-1.inc.php3

@@ -428,4 +428,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/swedish-utf-8.inc.php3

@@ -429,4 +429,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/thai-tis-620.inc.php3

@@ -429,4 +429,5 @@ $strYes = '
 
 $strZip = '"<22>١<EFBFBD>պ<EFBFBD>Ѵ<EFBFBD><D1B4><EFBFBD><EFBFBD> (zip)"';
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/thai-utf-8.inc.php3

@@ -430,4 +430,5 @@ $strYes = 'ใช่';
 
 $strZip = '"ถูกบีบอัดอยู่ (zip)"';
 
+$strServer = 'Server %s';  //to translate
 ?>

lang/turkish-iso-8859-9.inc.php3

@@ -434,4 +434,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/turkish-utf-8.inc.php3

@@ -435,4 +435,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/ukrainian-utf-8.inc.php3

@@ -437,4 +437,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

lang/ukrainian-windows-1251.inc.php3

@@ -436,4 +436,5 @@ $strInsecureMySQL = 'Your configuration file contains settings (root with no pas
 $strWebServerUploadDirectory = 'web-server upload directory';  //to translate
 $strWebServerUploadDirectoryError = 'The directory you set for upload work cannot be reached';  //to translate
 $strValidatorError = 'The SQL validator could not be initialized. Please check if you have installed the necessary php extensions as described in the %sdocumentation%s.'; //to translate
+$strServer = 'Server %s';  //to translate
 ?>

libraries/common.lib.php3

@@ -517,6 +517,16 @@ h1    {font-family: sans-serif; font-size: large; font-weight: bold}
         if ( ($val['connect_type'] == 'tcp') && empty($val['host']) ) {
             unset($cfg['Servers'][$key]);
         }
+
+        // Final solution to bug #582890 
+        // If we are using a socket connection
+        // and there is nothing in the verbose server name
+        // or the host field, then generate a name for the server
+        // in the form of "Server 2", localized of course!
+        if ( ($val['connect_type'] == 'socket') && empty($val['host']) && empty($val['verbose']) ) {
+            $cfg['Servers'][$key]['verbose'] = sprintf($GLOBALS['strServer'],$key);
+            $val['verbose'] = sprintf($GLOBALS['strServer'],$key);
+            }
     }
 
     if (empty($server) || !isset($cfg['Servers'][$server]) || !is_array($cfg['Servers'][$server])) {

main.php3

@@ -53,8 +53,14 @@ echo "\n";
 // loic1: modified in order to have a valid words order whatever is the
 //        language used
 if ($server > 0) {
-    $server_info     = $cfg['Server']['host']
+    // robbat2: Use the verbose name of the server instead of the hostname
-                     . (empty($cfg['Server']['port']) ? '' : ':' . $cfg['Server']['port']);
+    //          if a value is set
+    if(!empty($cfg['Server']['verbose'])) {
+        $server_info = $cfg['Server']['verbose'];
+    } else {
+        $server_info = $cfg['Server']['host'];
+    }
+    $server_info            .= (empty($cfg['Server']['port']) ? '' : ':' . $cfg['Server']['port']);
     // loic1: skip this because it's not a so good idea to display sockets
     //        used to everybody
     // if (!empty($cfg['Server']['socket']) && PMA_PHP_INT_VERSION >= 30010) {
@@ -112,7 +118,7 @@ if ($server == 0 || count($cfg['Servers']) > 1) {
                 echo ' selected="selected"';
             }
             echo '>';
-            if ($val['verbose'] != '') {
+            if (!empty($val['verbose'])) {
                 echo $val['verbose'];
             } else {
                 echo $val['host'];