diff --git a/lang/afrikaans-iso-8859-1.inc.php3 b/lang/afrikaans-iso-8859-1.inc.php3 index 15619c8cc..c5f188abf 100644 --- a/lang/afrikaans-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/afrikaans-utf-8.inc.php3 b/lang/afrikaans-utf-8.inc.php3 index a8e110a17..fa78bfe14 100644 --- a/lang/afrikaans-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/albanian-iso-8859-1.inc.php3 b/lang/albanian-iso-8859-1.inc.php3 index 5ed83c018..c221a602d 100644 --- a/lang/albanian-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/albanian-utf-8.inc.php3 b/lang/albanian-utf-8.inc.php3 index 44a0a67bd..5d16290b6 100644 --- a/lang/albanian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/arabic-utf-8.inc.php3 b/lang/arabic-utf-8.inc.php3 index 02f52af50..4d906ab92 100644 --- a/lang/arabic-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/arabic-windows-1256.inc.php3 b/lang/arabic-windows-1256.inc.php3 index 2b21eb1a3..2ec765694 100644 --- a/lang/arabic-windows-1256.inc.php3 +++ b/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 ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php3 b/lang/brazilian_portuguese-iso-8859-1.inc.php3 index 5787cb4a3..19431796b 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php3 b/lang/brazilian_portuguese-utf-8.inc.php3 index 18ed08842..7db95a461 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/bulgarian-koi8-r.inc.php3 b/lang/bulgarian-koi8-r.inc.php3 index 8861b3fa5..922d23f95 100644 --- a/lang/bulgarian-koi8-r.inc.php3 +++ b/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 ?> diff --git a/lang/bulgarian-utf-8.inc.php3 b/lang/bulgarian-utf-8.inc.php3 index 293cd9635..f973a3aa1 100644 --- a/lang/bulgarian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/bulgarian-windows-1251.inc.php3 b/lang/bulgarian-windows-1251.inc.php3 index e414a8e09..98d71766a 100644 --- a/lang/bulgarian-windows-1251.inc.php3 +++ b/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 ?> diff --git a/lang/catalan-iso-8859-1.inc.php3 b/lang/catalan-iso-8859-1.inc.php3 index 817e4ea7b..f34b8a671 100644 --- a/lang/catalan-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/catalan-utf-8.inc.php3 b/lang/catalan-utf-8.inc.php3 index dbb9f08e9..26d5e339a 100644 --- a/lang/catalan-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/chinese_big5-utf-8.inc.php3 b/lang/chinese_big5-utf-8.inc.php3 index 9bfa67d8d..c9509cf63 100644 --- a/lang/chinese_big5-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3 index 9cb702ea3..083d6ffeb 100644 --- a/lang/chinese_big5.inc.php3 +++ b/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 ?> diff --git a/lang/chinese_gb-utf-8.inc.php3 b/lang/chinese_gb-utf-8.inc.php3 index 10b5ee6f5..e37f095fb 100644 --- a/lang/chinese_gb-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3 index c6aa78efe..5699296f4 100644 --- a/lang/chinese_gb.inc.php3 +++ b/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 ?> diff --git a/lang/croatian-iso-8859-2.inc.php3 b/lang/croatian-iso-8859-2.inc.php3 index 0b8632217..c29b72b17 100644 --- a/lang/croatian-iso-8859-2.inc.php3 +++ b/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 ?> diff --git a/lang/croatian-utf-8.inc.php3 b/lang/croatian-utf-8.inc.php3 index 91656299b..136ed7329 100644 --- a/lang/croatian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/croatian-windows-1250.inc.php3 b/lang/croatian-windows-1250.inc.php3 index aab423354..9605c12cf 100644 --- a/lang/croatian-windows-1250.inc.php3 +++ b/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 ?> diff --git a/lang/czech-iso-8859-2.inc.php3 b/lang/czech-iso-8859-2.inc.php3 index 826a3ad03..035892cfa 100644 --- a/lang/czech-iso-8859-2.inc.php3 +++ b/lang/czech-iso-8859-2.inc.php3 @@ -432,4 +432,5 @@ $strYes = 'Ano'; $strZip = '"zazipováno"'; // To translate +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php3 b/lang/czech-utf-8.inc.php3 index a1a52fd95..b646511a8 100644 --- a/lang/czech-utf-8.inc.php3 +++ b/lang/czech-utf-8.inc.php3 @@ -433,4 +433,5 @@ $strYes = 'Ano'; $strZip = '"zazipováno"'; // To translate +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/czech-windows-1250.inc.php3 b/lang/czech-windows-1250.inc.php3 index 3f30f0357..74d7051b3 100644 --- a/lang/czech-windows-1250.inc.php3 +++ b/lang/czech-windows-1250.inc.php3 @@ -432,4 +432,5 @@ $strYes = 'Ano'; $strZip = '"zazipováno"'; // To translate +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/danish-iso-8859-1.inc.php3 b/lang/danish-iso-8859-1.inc.php3 index 19a78ecbb..8afcf457d 100644 --- a/lang/danish-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/danish-utf-8.inc.php3 b/lang/danish-utf-8.inc.php3 index 35c0bacde..e9fa1319d 100644 --- a/lang/danish-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/dutch-iso-8859-1.inc.php3 b/lang/dutch-iso-8859-1.inc.php3 index d821a617f..db3689da2 100644 --- a/lang/dutch-iso-8859-1.inc.php3 +++ b/lang/dutch-iso-8859-1.inc.php3 @@ -430,4 +430,5 @@ $strYes = 'Ja'; $strZip = '"Gezipt"'; +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php3 b/lang/dutch-utf-8.inc.php3 index a94b123dc..7b0b466f1 100644 --- a/lang/dutch-utf-8.inc.php3 +++ b/lang/dutch-utf-8.inc.php3 @@ -431,4 +431,5 @@ $strYes = 'Ja'; $strZip = '"Gezipt"'; +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php3 b/lang/english-iso-8859-1.inc.php3 index 6c72f19e6..12576b1fd 100644 --- a/lang/english-iso-8859-1.inc.php3 +++ b/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\'...
If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').'; diff --git a/lang/english-utf-8.inc.php3 b/lang/english-utf-8.inc.php3 index 1b34cb051..b39cdc901 100644 --- a/lang/english-utf-8.inc.php3 +++ 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\'...
If you ever need to put a backslash ("\") or a single quote ("\'") amongst those values, backslashes it (for example \'\\\\xyz\' or \'a\\\'b\').'; diff --git a/lang/estonian-iso-8859-1.inc.php3 b/lang/estonian-iso-8859-1.inc.php3 index bdadb6e46..38d77d63d 100644 --- a/lang/estonian-iso-8859-1.inc.php3 +++ b/lang/estonian-iso-8859-1.inc.php3 @@ -427,4 +427,5 @@ $strYes = 'Jah'; $strZip = '"zipitud"'; // To translate +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php3 b/lang/estonian-utf-8.inc.php3 index aced43b06..49953a62c 100644 --- a/lang/estonian-utf-8.inc.php3 +++ b/lang/estonian-utf-8.inc.php3 @@ -428,4 +428,5 @@ $strYes = 'Jah'; $strZip = '"zipitud"'; // To translate +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php3 b/lang/finnish-iso-8859-1.inc.php3 index ac13fc98f..56e01b967 100644 --- a/lang/finnish-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/finnish-utf-8.inc.php3 b/lang/finnish-utf-8.inc.php3 index 1d4bdd26a..fdd08d49b 100644 --- a/lang/finnish-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/french-iso-8859-1.inc.php3 b/lang/french-iso-8859-1.inc.php3 index 00f5b1132..c5a0d9d60 100644 --- a/lang/french-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/french-utf-8.inc.php3 b/lang/french-utf-8.inc.php3 index 191dcdd78..b1827c470 100644 --- a/lang/french-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/galician-iso-8859-1.inc.php3 b/lang/galician-iso-8859-1.inc.php3 index 2b122ca71..043cae35c 100644 --- a/lang/galician-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/galician-utf-8.inc.php3 b/lang/galician-utf-8.inc.php3 index 0f805cdcb..75da4d631 100644 --- a/lang/galician-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/georgian-utf-8.inc.php3 b/lang/georgian-utf-8.inc.php3 index db7eaab4d..336091e8b 100644 --- a/lang/georgian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/german-iso-8859-1.inc.php3 b/lang/german-iso-8859-1.inc.php3 index 8a859c477..5039f67e5 100644 --- a/lang/german-iso-8859-1.inc.php3 +++ b/lang/german-iso-8859-1.inc.php3 @@ -435,4 +435,5 @@ $strYes = 'Ja'; $strZip = 'Zip-komprimiert'; // To translate +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/german-utf-8.inc.php3 b/lang/german-utf-8.inc.php3 index 8f149cd8e..668366bdf 100644 --- a/lang/german-utf-8.inc.php3 +++ b/lang/german-utf-8.inc.php3 @@ -436,4 +436,5 @@ $strYes = 'Ja'; $strZip = 'Zip-komprimiert'; // To translate +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/greek-iso-8859-7.inc.php3 b/lang/greek-iso-8859-7.inc.php3 index ebe74cef0..1930706b4 100644 --- a/lang/greek-iso-8859-7.inc.php3 +++ b/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 ?> diff --git a/lang/greek-utf-8.inc.php3 b/lang/greek-utf-8.inc.php3 index 34ca34b53..ed5437ff7 100644 --- a/lang/greek-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php3 b/lang/hebrew-iso-8859-8-i.inc.php3 index b63cd458f..65bcb53d7 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php3 +++ b/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 ?> diff --git a/lang/hindi-utf-8.inc.php3 b/lang/hindi-utf-8.inc.php3 index 7ea7d706e..f537e4c10 100644 --- a/lang/hindi-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/hungarian-iso-8859-2.inc.php3 b/lang/hungarian-iso-8859-2.inc.php3 index 6f5158c9a..2613d9ff6 100644 --- a/lang/hungarian-iso-8859-2.inc.php3 +++ b/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 ?> diff --git a/lang/hungarian-utf-8.inc.php3 b/lang/hungarian-utf-8.inc.php3 index b8f76123f..a6736c7cc 100644 --- a/lang/hungarian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/indonesian-iso-8859-1.inc.php3 b/lang/indonesian-iso-8859-1.inc.php3 index 79de2276c..19b87b29a 100644 --- a/lang/indonesian-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/indonesian-utf-8.inc.php3 b/lang/indonesian-utf-8.inc.php3 index 02864ec08..66f3689cc 100644 --- a/lang/indonesian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/italian-iso-8859-1.inc.php3 b/lang/italian-iso-8859-1.inc.php3 index 775369efa..d09a4a62a 100644 --- a/lang/italian-iso-8859-1.inc.php3 +++ b/lang/italian-iso-8859-1.inc.php3 @@ -433,4 +433,5 @@ $strYes = ' Si '; $strZip = '"compresso con zip"'; // To translate +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php3 b/lang/italian-utf-8.inc.php3 index c505c9dab..2f176f921 100644 --- a/lang/italian-utf-8.inc.php3 +++ b/lang/italian-utf-8.inc.php3 @@ -434,4 +434,5 @@ $strYes = ' Si '; $strZip = '"compresso con zip"'; // To translate +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/japanese-euc.inc.php3 b/lang/japanese-euc.inc.php3 index 340e9c807..00cc8aa2f 100644 --- a/lang/japanese-euc.inc.php3 +++ b/lang/japanese-euc.inc.php3 @@ -436,4 +436,5 @@ $strXkana = ' $strYes = '¤Ï¤¤'; $strZip = '"zip¤µ¤ì¤ë"'; +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php3 b/lang/japanese-sjis.inc.php3 index 2231bc835..4fd01219c 100644 --- a/lang/japanese-sjis.inc.php3 +++ b/lang/japanese-sjis.inc.php3 @@ -435,4 +435,5 @@ $strXkana = ' $strYes = '‚Í‚¢'; $strZip = '"zip‚³‚ê‚é"'; +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php3 b/lang/japanese-utf-8.inc.php3 index ff62a6eff..560d95b53 100644 --- a/lang/japanese-utf-8.inc.php3 +++ b/lang/japanese-utf-8.inc.php3 @@ -1,4 +1,5 @@ diff --git a/lang/korean-ks_c_5601-1987.inc.php3 b/lang/korean-ks_c_5601-1987.inc.php3 index 9619b7760..496a31365 100644 --- a/lang/korean-ks_c_5601-1987.inc.php3 +++ b/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 ?> diff --git a/lang/latvian-utf-8.inc.php3 b/lang/latvian-utf-8.inc.php3 index 950b64307..29c4f7009 100644 --- a/lang/latvian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/latvian-windows-1257.inc.php3 b/lang/latvian-windows-1257.inc.php3 index fdc68f80a..5f64f0323 100644 --- a/lang/latvian-windows-1257.inc.php3 +++ b/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 ?> diff --git a/lang/lithuanian-utf-8.inc.php3 b/lang/lithuanian-utf-8.inc.php3 index d60d6b349..bb40834b6 100644 --- a/lang/lithuanian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/lithuanian-windows-1257.inc.php3 b/lang/lithuanian-windows-1257.inc.php3 index 1ad3f0235..d1b792158 100644 --- a/lang/lithuanian-windows-1257.inc.php3 +++ b/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 ?> diff --git a/lang/malay-iso-8859-1.inc.php3 b/lang/malay-iso-8859-1.inc.php3 index 7267a7b3b..9920d9c67 100644 --- a/lang/malay-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/malay-utf-8.inc.php3 b/lang/malay-utf-8.inc.php3 index bc68951f4..601e71b8b 100644 --- a/lang/malay-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/norwegian-iso-8859-1.inc.php3 b/lang/norwegian-iso-8859-1.inc.php3 index 279cc4628..e8d89ef18 100644 --- a/lang/norwegian-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/norwegian-utf-8.inc.php3 b/lang/norwegian-utf-8.inc.php3 index 4cefa1ee9..ef46b447b 100644 --- a/lang/norwegian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/polish-iso-8859-2.inc.php3 b/lang/polish-iso-8859-2.inc.php3 index 0441d1c89..07ff85126 100644 --- a/lang/polish-iso-8859-2.inc.php3 +++ b/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 ?> diff --git a/lang/polish-utf-8.inc.php3 b/lang/polish-utf-8.inc.php3 index f9b5870d0..f50fe731b 100644 --- a/lang/polish-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/portuguese-iso-8859-1.inc.php3 b/lang/portuguese-iso-8859-1.inc.php3 index 01eb33217..e6555d875 100644 --- a/lang/portuguese-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/portuguese-utf-8.inc.php3 b/lang/portuguese-utf-8.inc.php3 index 0002d84cb..6790bf139 100644 --- a/lang/portuguese-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/romanian-iso-8859-1.inc.php3 b/lang/romanian-iso-8859-1.inc.php3 index 370c306c9..fecd225e8 100644 --- a/lang/romanian-iso-8859-1.inc.php3 +++ b/lang/romanian-iso-8859-1.inc.php3 @@ -427,4 +427,5 @@ $strYes = 'Da'; $strZip = '"arhivat"'; // To translate +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php3 b/lang/romanian-utf-8.inc.php3 index 159d45267..f681acf09 100644 --- a/lang/romanian-utf-8.inc.php3 +++ b/lang/romanian-utf-8.inc.php3 @@ -428,4 +428,5 @@ $strYes = 'Da'; $strZip = '"arhivat"'; // To translate +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php3 b/lang/russian-koi8-r.inc.php3 index 0f4837d8b..be48951d3 100644 --- a/lang/russian-koi8-r.inc.php3 +++ b/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 ?> diff --git a/lang/russian-utf-8.inc.php3 b/lang/russian-utf-8.inc.php3 index 4117ea48b..0ffde822c 100644 --- a/lang/russian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/russian-windows-1251.inc.php3 b/lang/russian-windows-1251.inc.php3 index 146864470..19c724ef9 100644 --- a/lang/russian-windows-1251.inc.php3 +++ b/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 ?> diff --git a/lang/serbian-utf-8.inc.php3 b/lang/serbian-utf-8.inc.php3 index b37ef7448..17ed98046 100644 --- a/lang/serbian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/serbian-windows-1250.inc.php3 b/lang/serbian-windows-1250.inc.php3 index 3843f331b..aa21dc831 100644 --- a/lang/serbian-windows-1250.inc.php3 +++ b/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 ?> diff --git a/lang/slovak-iso-8859-2.inc.php3 b/lang/slovak-iso-8859-2.inc.php3 index 1510e0293..30eab97ca 100644 --- a/lang/slovak-iso-8859-2.inc.php3 +++ b/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 ?> diff --git a/lang/slovak-utf-8.inc.php3 b/lang/slovak-utf-8.inc.php3 index c700fb0fc..cb097ac33 100644 --- a/lang/slovak-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/slovak-windows-1250.inc.php3 b/lang/slovak-windows-1250.inc.php3 index a977a0d3e..4f505f29f 100644 --- a/lang/slovak-windows-1250.inc.php3 +++ b/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 ?> diff --git a/lang/slovenian-iso-8859-2.inc.php3 b/lang/slovenian-iso-8859-2.inc.php3 index ad4b303b6..300d37e3f 100644 --- a/lang/slovenian-iso-8859-2.inc.php3 +++ b/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 ?> diff --git a/lang/slovenian-utf-8.inc.php3 b/lang/slovenian-utf-8.inc.php3 index 755ae3ea6..a7a57141e 100644 --- a/lang/slovenian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/slovenian-windows-1250.inc.php3 b/lang/slovenian-windows-1250.inc.php3 index 126f1bc65..24fa995d7 100644 --- a/lang/slovenian-windows-1250.inc.php3 +++ b/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 ?> diff --git a/lang/spanish-iso-8859-1.inc.php3 b/lang/spanish-iso-8859-1.inc.php3 index da11f11a5..4d82a73ec 100644 --- a/lang/spanish-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/spanish-utf-8.inc.php3 b/lang/spanish-utf-8.inc.php3 index 4b8655e58..273ab3483 100644 --- a/lang/spanish-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/swedish-iso-8859-1.inc.php3 b/lang/swedish-iso-8859-1.inc.php3 index f425f0771..f3df869f2 100644 --- a/lang/swedish-iso-8859-1.inc.php3 +++ b/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 ?> diff --git a/lang/swedish-utf-8.inc.php3 b/lang/swedish-utf-8.inc.php3 index 702154e7e..8fccac503 100644 --- a/lang/swedish-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/thai-tis-620.inc.php3 b/lang/thai-tis-620.inc.php3 index ae90ee5cd..d17f99a1d 100644 --- a/lang/thai-tis-620.inc.php3 +++ b/lang/thai-tis-620.inc.php3 @@ -429,4 +429,5 @@ $strYes = ' $strZip = '"¶Ù¡ºÕºÍÑ´ÍÂÙè (zip)"'; +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php3 b/lang/thai-utf-8.inc.php3 index 94037ef33..adb1e1877 100644 --- a/lang/thai-utf-8.inc.php3 +++ b/lang/thai-utf-8.inc.php3 @@ -430,4 +430,5 @@ $strYes = 'ใช่'; $strZip = '"ถูà¸à¸šà¸µà¸šà¸­à¸±à¸”อยู่ (zip)"'; +$strServer = 'Server %s'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php3 b/lang/turkish-iso-8859-9.inc.php3 index 60a5e7b9b..d80bcb4dd 100644 --- a/lang/turkish-iso-8859-9.inc.php3 +++ b/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 ?> diff --git a/lang/turkish-utf-8.inc.php3 b/lang/turkish-utf-8.inc.php3 index 9bc026d1e..3203a0280 100644 --- a/lang/turkish-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/ukrainian-utf-8.inc.php3 b/lang/ukrainian-utf-8.inc.php3 index 03fec1c2d..629d9607d 100644 --- a/lang/ukrainian-utf-8.inc.php3 +++ b/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 ?> diff --git a/lang/ukrainian-windows-1251.inc.php3 b/lang/ukrainian-windows-1251.inc.php3 index 1f69b7431..ee07729de 100644 --- a/lang/ukrainian-windows-1251.inc.php3 +++ b/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 ?> diff --git a/libraries/common.lib.php3 b/libraries/common.lib.php3 index fd4a64298..cc6b279a2 100644 --- a/libraries/common.lib.php3 +++ b/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])) { diff --git a/main.php3 b/main.php3 index ceddba7ec..ec77277f5 100755 --- a/main.php3 +++ b/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'] - . (empty($cfg['Server']['port']) ? '' : ':' . $cfg['Server']['port']); + // robbat2: Use the verbose name of the server instead of the hostname + // 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'];