diff --git a/header.inc.php3 b/header.inc.php3
index 923fe77c8..2fc0e8e16 100755
--- a/header.inc.php3
+++ b/header.inc.php3
@@ -77,8 +77,8 @@ if (isset($table)) {
$title .= (empty($title) ? '' : '.') . str_replace('\'', '\\\'', $table);
}
if (!empty($cfgServer) && isset($cfgServer['host'])) {
- $title .= (empty($title) ? '' : ' ') . trim($strRunning) . ' '
- . (empty($cfgServer['verbose']) ? str_replace('\'', '\\\'', $cfgServer['host']) : str_replace('\'', '\\\'', $cfgServer['verbose']));
+ $title .= (empty($title) ? '' : ' ')
+ . sprintf($strRunning, (empty($cfgServer['verbose']) ? str_replace('\'', '\\\'', $cfgServer['host']) : str_replace('\'', '\\\'', $cfgServer['verbose'])));
}
$title .= (empty($title) ? '' : ' - ') . 'phpMyAdmin ' . PMA_VERSION;
?>
@@ -145,8 +145,7 @@ if (isset($db)) {
if (!empty($table)) {
echo ' - ' . $strTable . ' ' . htmlspecialchars($table) . '';
}
- echo ' ' . trim($strRunning)
- . ' ' . (($cfgServer['verbose']) ? $cfgServer['verbose'] : $cfgServer['host']) . '';
+ echo ' ' . sprintf($strRunning, ' ' . (($cfgServer['verbose']) ? $cfgServer['verbose'] : $cfgServer['host']) . '');
echo '' . "\n";
}
echo "\n";
diff --git a/lang/arabic.inc.php3 b/lang/arabic.inc.php3
index f27f0e6b9..08e89930e 100644
--- a/lang/arabic.inc.php3
+++ b/lang/arabic.inc.php3
@@ -184,6 +184,7 @@ $strMoveTable = '
$strMoveTableOK = '%s ÌÏæá Êã äÞáå Åáì %s.';
$strMySQLReloaded = 'MySQL ãÚÇÏ ÊÍãíáå.';
$strMySQLSaid = 'MySQL ÞÇá: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% íÚãá Úáì %pma_s2% ßÜ %pma_s3%';
$strMySQLShowProcess = 'ÚÑÖ ÚãáíÇÊ';
$strMySQLShowStatus = 'ÚÑÖ MySQL runtime ßãÚáæãÇÊ';
$strMySQLShowVars = 'ÚÑÖ MySQL ßãÊÛíÑÇÊå';
@@ -260,8 +261,7 @@ $strRows = '
$strRowsFrom = 'ÕÝæÝ ÊÈÏà ãä';
$strRowSize = ' ãÞÇÓ ÇáÕÝ ';
$strRowsStatistic = 'ÅÍÕÇÁ ÇáÕÝ';
-$strRunning = 'íÚãá Úáì ';
-$strRunningAs = 'ßÜ';
+$strRunning = 'íÚãá Úáì %s';
$strRunQuery = 'ÅÑÓÇá ÇáÅÓÊÚáÇã';
$strRunSQLQuery = 'ÊäÝíÐ ÅÓÊÚáÇã/ÅÓÊÚáÇãÇÊ SQL Úáì ÞÇÚÏÉ ÈíÇäÇÊ %s';
diff --git a/lang/brazilian_portuguese.inc.php3 b/lang/brazilian_portuguese.inc.php3
index ea5ba3283..a71c7294f 100644
--- a/lang/brazilian_portuguese.inc.php3
+++ b/lang/brazilian_portuguese.inc.php3
@@ -229,7 +229,7 @@ $strRows = 'Colunas';
$strRowsFrom = 'colunas começando de';
$strRowSize = ' Tamanho do registro ';
$strRowsStatistic = 'Estatistícas da Coluna';
-$strRunning = 'Rodando em ';
+$strRunning = 'Rodando em %s';
$strRunQuery = 'Envia Query';
$strRunSQLQuery = 'Fazer procura(s) SQL no banco de dados %s';
@@ -310,9 +310,9 @@ $strInvalidName = '"%s" is a reserved word, you can\'t use it as a database/tabl
$strKeepPass = 'Do not change the password';//to translate
$strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNoFrames = 'phpMyAdmin is more friendly with a frames-capable browser.';
$strNoQuery = 'No SQL query!'; //to translate
-$strRunningAs = 'as';
$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\').'; //to translate
$strShowAll = 'Show all'; // to translate
$strShowCols = 'Show columns';
diff --git a/lang/bulgarian-win1251.inc.php3 b/lang/bulgarian-win1251.inc.php3
index 7ad42c9d3..624fc390f 100644
--- a/lang/bulgarian-win1251.inc.php3
+++ b/lang/bulgarian-win1251.inc.php3
@@ -164,6 +164,7 @@ $strMoveTable = '
$strMoveTableOK = 'Òàáëèöàòà %s áåøå ïðåìåñòåíà êúì %s.';
$strMySQLReloaded = 'MySQL å ïðåçàðåäåí.';
$strMySQLSaid = 'MySQL îòãîâîðè: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% å ñòàðòèðàí íà %pma_s2% êàòî %pma_s3%';
$strMySQLShowProcess = 'Ïîêàæè ïðîöåñèòå';
$strMySQLShowStatus = 'Ïîêàæè ñúñòîÿíèåòî íà MySQL';
$strMySQLShowVars = 'Ïîêàæè ñèñòåìíèòå ïðîìåíëèâè íà MySQL';
@@ -233,8 +234,7 @@ $strRows = 'Rows'; //to translate
$strRowsFrom = 'ðåäà çàïî÷âàéêè îò';
$strRowSize = ' Ðàçìåð íà ðåä ';
$strRowsStatistic = 'Ñòàòèñòèêà çà ðåäà';
-$strRunning = 'å ñòàðòèðàí íà ';
-$strRunningAs = 'êàòî';
+$strRunning = 'å ñòàðòèðàí íà %s';
$strRunQuery = 'Èçïúëíè Çàïèòâàíåòî';
$strRunSQLQuery = 'Ñòàðòèðàíå SQL çàÿâêà/çàÿâêè êúì áàçà îò äàííè %s';
diff --git a/lang/catala.inc.php3 b/lang/catala.inc.php3
index 13b7adb32..a370e9126 100644
--- a/lang/catala.inc.php3
+++ b/lang/catala.inc.php3
@@ -202,7 +202,7 @@ $strRows = 'Fila';
$strRowsFrom = 'Files començant des de';
$strRowSize = ' tamany de fila ';
$strRowsStatistic = 'Estadística de files';
-$strRunning = 'funcionant a ';
+$strRunning = 'funcionant a %s';
$strRunQuery = 'Submit Query'; //to translate (tbl_qbe.php3)
$strSave = 'Guardar';
@@ -295,6 +295,7 @@ $strLengthSet = 'Length/Values*'; //to translate
$strLinesTerminatedBy = 'Lines terminated by';//to translate
$strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNoDatabases = 'No databases';
$strNoDropDatabases = '"DROP DATABASE" statements are disabled.';
$strNoFrames = 'phpMyAdmin is more friendly with a frames-capable browser.';
@@ -304,7 +305,6 @@ $strPartialText = 'Partial Texts';//to translate
$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strQueryOnDb = 'SQL-query on database ';
-$strRunningAs = 'as';
$strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate
$strServerChoice = 'Server Choice';//to translate
$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/chinese_big5.inc.php3 b/lang/chinese_big5.inc.php3
index 22b674e2c..ebd703b6f 100644
--- a/lang/chinese_big5.inc.php3
+++ b/lang/chinese_big5.inc.php3
@@ -203,7 +203,7 @@ $strRows = '
$strRowsFrom = 'µ§°O¿ý¡A¶}©l¦C¼Æ:';
$strRowSize = '¸ê®Æ¦C¤j¤p';
$strRowsStatistic = '¸ê®Æ¦C²Îp¼ÆÈ';
-$strRunning = '°õ¦æ©ó ';
+$strRunning = '°õ¦æ©ó %s';
$strRunQuery = 'Submit Query'; //to translate (tbl_qbe.php3)
$strSave = 'Àx¦s';
@@ -294,6 +294,7 @@ $strKeepPass = 'Do not change the password';//to translate
$strLinesTerminatedBy = 'Lines terminated by';//to translate
$strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNoDatabases = 'No databases';
$strNoDropDatabases = '"DROP DATABASE" statements are disabled.';
$strNoFrames = 'phpMyAdmin is more friendly with a frames-capable browser.';
@@ -303,7 +304,6 @@ $strPartialText = 'Partial Texts';//to translate
$strPmaDocumentation = 'phpMyAdmin Documentation';//to translate
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strQueryOnDb = ' SQL-query on database '; //to translate
-$strRunningAs = 'as';
$strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate
$strServerChoice = 'Server Choice';//to translate
$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/chinese_gb.inc.php3 b/lang/chinese_gb.inc.php3
index 449693069..bbe204ecd 100644
--- a/lang/chinese_gb.inc.php3
+++ b/lang/chinese_gb.inc.php3
@@ -193,7 +193,7 @@ $strRowLength = 'Row length'; //to translate
$strRows = 'Rows'; //to translate
$strRowsFrom = 'rows starting from'; //to translate
$strRowsStatistic = 'Row Statistic'; //to translate
-$strRunning = 'ÔËÐÐÓÚ ';
+$strRunning = 'ÔËÐÐÓÚ %s';
$strRunQuery = 'Submit Query'; //to translate (tbl_qbe.php3)
$strSave = '´æ´¢';
@@ -296,6 +296,7 @@ $strKeepPass = 'Do not change the password';//to translate
$strLinesTerminatedBy = 'Lines terminated by';//to translate
$strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNbRecords = 'no. of records';
$strNoDatabases = 'No databases';
$strNoDropDatabases = '"DROP DATABASE" statements are disabled.';
@@ -307,7 +308,6 @@ $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strQueryOnDb = 'SQL-query on database ';
$strRowSize = ' Row size '; //to translate
-$strRunningAs = 'as';
$strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate
$strServerChoice = 'Server Choice';//to translate
$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/czech-iso.inc.php3 b/lang/czech-iso.inc.php3
index 21f2e9006..9317a5d63 100644
--- a/lang/czech-iso.inc.php3
+++ b/lang/czech-iso.inc.php3
@@ -180,6 +180,7 @@ $strMoveTable = 'P
$strMoveTableOK = 'Tabulka %s byla pøesunuta do %s.';
$strMySQLReloaded = 'MySQL znovu-naètena.';
$strMySQLSaid = 'MySQL hlásí: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% bì¾ící na %pma_s2% jako %pma_s3%';
$strMySQLShowProcess = 'Zobraz procesy';
$strMySQLShowStatus = 'Ukázat MySQL runtime informace';
$strMySQLShowVars = 'Ukázat MySQL systémové promìnné';
@@ -256,8 +257,7 @@ $strRows = '
$strRowsFrom = 'øádkù zaèínající od';
$strRowSize = ' Velikost øádku ';
$strRowsStatistic = 'Statistika øádkù';
-$strRunning = 'bì¾ící na ';
-$strRunningAs = 'jako';
+$strRunning = 'bì¾ící na %s';
$strRunQuery = 'Provést dotaz';
$strRunSQLQuery = 'Spustit SQL dotaz(y) na databázi %s';
diff --git a/lang/czech-win1250.inc.php3 b/lang/czech-win1250.inc.php3
index a43be733b..a03dfdad5 100644
--- a/lang/czech-win1250.inc.php3
+++ b/lang/czech-win1250.inc.php3
@@ -181,6 +181,7 @@ $strMoveTable = 'P
$strMoveTableOK = 'Tabulka %s byla pøesunuta do %s.';
$strMySQLReloaded = 'MySQL znovu-naètena.';
$strMySQLSaid = 'MySQL hlásí: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% bìžící na %pma_s2% jako %pma_s3%';
$strMySQLShowProcess = 'Zobraz procesy';
$strMySQLShowStatus = 'Ukázat MySQL runtime informace';
$strMySQLShowVars = 'Ukázat MySQL systémové promìnné';
@@ -258,8 +259,7 @@ $strRows = '
$strRowsFrom = 'øádkù zaèínající od';
$strRowSize = ' Velikost øádku ';
$strRowsStatistic = 'Statistika øádkù';
-$strRunning = 'bìžící na ';
-$strRunningAs = 'jako';
+$strRunning = 'bìžící na %s';
$strRunQuery = 'Provést dotaz';
$strRunSQLQuery = 'Spustit SQL dotaz(y) na databázi %s';
diff --git a/lang/danish.inc.php3 b/lang/danish.inc.php3
index 65646e2bc..cf1f11548 100644
--- a/lang/danish.inc.php3
+++ b/lang/danish.inc.php3
@@ -166,6 +166,7 @@ $strMoveTable = 'Flyt tabel til (database.tabel):';
$strMoveTableOK = 'Tabel %s er flyttet til %s.';
$strMySQLReloaded = 'MySQL genstartet.';
$strMySQLSaid = 'MySQL returnerede: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% kører på %pma_s2% som %pma_s3%';
$strMySQLShowProcess = 'Vis tråde';
$strMySQLShowStatus = 'Vis MySQL runtime information';
$strMySQLShowVars = 'Vis MySQL system variable';
@@ -236,8 +237,7 @@ $strRows = 'R
$strRowsFrom = 'rækker startende fra';
$strRowSize = ' Række størrelse ';
$strRowsStatistic = 'Række statistik';
-$strRunning = 'kører på ';
-$strRunningAs = 'som';
+$strRunning = 'kører på %s';
$strRunQuery = 'Send forespørgsel';
$strRunSQLQuery = 'Kør SQL forspørgsel(er) på database %s';
diff --git a/lang/dutch.inc.php3 b/lang/dutch.inc.php3
index 34275380f..516a48447 100644
--- a/lang/dutch.inc.php3
+++ b/lang/dutch.inc.php3
@@ -215,7 +215,7 @@ $strRows = 'Rijen';
$strRowsFrom = 'rijen beginnend bij';
$strRowSize = ' Rij grootte ';
$strRowsStatistic = 'Rij statistiek';
-$strRunning = 'wordt uitgevoerd op ';
+$strRunning = 'wordt uitgevoerd op %s';
$strRunQuery = 'Query uitvoeren';
$strSave = 'Opslaan';
@@ -303,11 +303,11 @@ $strKeepPass = 'Do not change the password';//to translate
$strLinesTerminatedBy = 'Lines terminated by';//to translate
$strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNoDropDatabases = '"DROP DATABASE" statements zijn niet mogelijk.'; //to translate
$strNoFrames = 'phpMyAdmin is more friendly with a frames-capable browser.';
$strNoQuery = 'No SQL query!'; //to translate
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
-$strRunningAs = 'as';
$strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate
$strShowAll = 'Show all'; // to translate
$strShowCols = 'Show columns';
diff --git a/lang/english.inc.php3 b/lang/english.inc.php3
index 314d92d65..18ee06cc4 100644
--- a/lang/english.inc.php3
+++ b/lang/english.inc.php3
@@ -180,6 +180,7 @@ $strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
$strMySQLReloaded = 'MySQL reloaded.';
$strMySQLSaid = 'MySQL said: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strMySQLShowProcess = 'Show processes';
$strMySQLShowStatus = 'Show MySQL runtime information';
$strMySQLShowVars = 'Show MySQL system variables';
@@ -256,8 +257,7 @@ $strRows = 'Rows';
$strRowsFrom = 'rows starting from';
$strRowSize = ' Row size ';
$strRowsStatistic = 'Row Statistic';
-$strRunning = 'running on ';
-$strRunningAs = 'as';
+$strRunning = 'running on %s';
$strRunQuery = 'Submit Query';
$strRunSQLQuery = 'Run SQL query/queries on database %s';
diff --git a/lang/finnish.inc.php3 b/lang/finnish.inc.php3
index 232598bda..c6a6379a4 100644
--- a/lang/finnish.inc.php3
+++ b/lang/finnish.inc.php3
@@ -184,6 +184,7 @@ $strMoveTable = 'Siirra taulu (tietokanta.taulu):';
$strMoveTableOK = 'Taulu %s on siirretty %s.';
$strMySQLReloaded = 'MySQL uudelleenladattu.';
$strMySQLSaid = 'MySQL ilmoittaa: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% palvelimella %pma_s2% käyttäjänä %pma_s3%';
$strMySQLShowProcess = 'Näytä prosessit';
$strMySQLShowStatus = 'Näytä MySQL:n ajonaikaiset tiedot';
$strMySQLShowVars = 'Näytä MySQL:n järjestelmämuuttujat';
@@ -260,10 +261,10 @@ $strRows = 'rivi
$strRowsFrom = 'riviä alkaen rivistä';
$strRowSize = ' Rivin koko ';
$strRowsStatistic = 'Rivistatistiikka';
-$strRunning = 'palvelimella ';
-$strRunningAs = 'käyttäjänä';
+$strRunning = 'palvelimella %s';
$strRunQuery = 'Suorita';
$strRunSQLQuery = 'Suorita SQL-lauseita tietokannassa %s';
+
$strSave = 'Tallenna';
$strSelect = 'Hae';
$strSelectFields = 'Valitse sarakkeet (vähintään yksi):';
diff --git a/lang/french.inc.php3 b/lang/french.inc.php3
index 49f9e6d6b..9ee6c865d 100644
--- a/lang/french.inc.php3
+++ b/lang/french.inc.php3
@@ -180,6 +180,7 @@ $strMoveTable = 'D
$strMoveTableOK = 'La table %s a été déplacée vers %s.';
$strMySQLReloaded = 'MySQL rechargé.';
$strMySQLSaid = 'MySQL a répondu:';
+$strMySQLServerProcess = 'MySQL %pma_s1% sur le serveur %pma_s2% - utilisateur : %pma_s3%';
$strMySQLShowProcess = 'Afficher les processus';
$strMySQLShowStatus = 'Afficher l\'état du serveur MySQL';
$strMySQLShowVars = 'Afficher les variables du serveur MySQL';
@@ -256,8 +257,7 @@ $strRows = 'Enregistrements';
$strRowsFrom = 'lignes à partir de';
$strRowSize = ' Taille enr. ';
$strRowsStatistic = 'Statistiques';
-$strRunning = 'sur le serveur ';
-$strRunningAs = '- utilisateur :';
+$strRunning = 'sur le serveur %s';
$strRunQuery = 'Exécuter la requête';
$strRunSQLQuery = 'Exécuter une ou des requêtes sur la base %s';
diff --git a/lang/galician.inc.php3 b/lang/galician.inc.php3
index 29feec9fb..d699cc348 100644
--- a/lang/galician.inc.php3
+++ b/lang/galician.inc.php3
@@ -256,8 +256,8 @@ $strRows = 'Filas';
$strRowsFrom = 'filas, a comezar da';
$strRowSize= ' Tamaño da fila ';
$strRowsStatistic = 'Estatistícas da Fila';
-$strRunning = 'a rodar no servidor ';
-$strRunningAs = 'como';
+$strRunning = 'a rodar no servidor %s';
+$strMySQLServerProcess = 'MySQL %pma_s1% a rodar no servidor %pma_s2% como %pma_s3%';
$strRunQuery = 'Enviar esta procura';
$strRunSQLQuery = 'Efectuar unha procura SQL na base de datos %s';
diff --git a/lang/german.inc.php3 b/lang/german.inc.php3
index f313851c8..2c698c1ff 100644
--- a/lang/german.inc.php3
+++ b/lang/german.inc.php3
@@ -249,7 +249,7 @@ $strRows = 'Zeilen';
$strRowsFrom = 'Datensätze, beginnend ab';
$strRowSize = 'Zeilengröße';
$strRowsStatistic = 'Zeilenstatistik';
-$strRunning = 'auf ';
+$strRunning = 'auf %s';
$strRunQuery = 'SQL Befehl ausführen';
$strRunSQLQuery = 'SQL-Befehl(e) ausführen in Datenbank %s';
@@ -330,7 +330,7 @@ $strZip = '"Zip komprimiert"';
$strBookmarkDeleted = 'The bookmark has been deleted.';
$strFieldHasBeenDropped = 'Field %s has been dropped';//to translate
$strIndexHasBeenDropped = 'Index %s has been dropped';//to translate
-$strRunningAs = 'as';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strShowCols = 'Show columns';
$strShowTables = 'Show tables';
diff --git a/lang/greek.inc.php3 b/lang/greek.inc.php3
index 0677f6440..9da36a741 100644
--- a/lang/greek.inc.php3
+++ b/lang/greek.inc.php3
@@ -221,7 +221,7 @@ $strRows = '
$strRowsFrom = 'ÃñáììÝò ðïõ áñ÷ßæïõí áðü';
$strRowSize = ' ÌÝãåèïò ÃñáììÞò ';
$strRowsStatistic = 'ÓôáôéóôéêÜ Ãñáììþí';
-$strRunning = 'ðïõ ôñÝ÷åé óôï ';
+$strRunning = 'ðïõ ôñÝ÷åé óôï %s';
$strRunQuery = 'ÕðïâïëÞ åðåñþôçóçò';
$strSave = 'ÁðïèÞêåõóç';
@@ -308,10 +308,10 @@ $strKeepPass = 'Do not change the password';//to translate
$strLinesTerminatedBy = 'Lines terminated by';//to translate
$strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNoFrames = 'phpMyAdmin is more friendly with a frames-capable browser.';
$strNoQuery = 'No SQL query!'; //to translate
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
-$strRunningAs = 'as';
$strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate
$strShowAll = 'Show all'; // to translate
$strShowCols = 'Show columns';
diff --git a/lang/italian.inc.php3 b/lang/italian.inc.php3
index a43fbcbc4..b38ad467a 100644
--- a/lang/italian.inc.php3
+++ b/lang/italian.inc.php3
@@ -182,6 +182,7 @@ $strMoveTable = 'Sposta la tabella nel (database.tabella):';
$strMoveTableOK = 'La tabella %s è stata spostata in %s.';
$strMySQLReloaded = 'MySQL riavviato.';
$strMySQLSaid = 'Messaggio di MySQL: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% in esecuzione su %pma_s2% come %pma_s3%';
$strMySQLShowProcess = 'Visualizza processi in esecuzione';
$strMySQLShowStatus = 'Visualizza informazioni di runtime di MySQL';
$strMySQLShowVars = 'Visualizza variabili di sistema di MySQL';
@@ -258,8 +259,7 @@ $strRows = 'Righe';
$strRowsFrom = 'righe a partire da';
$strRowSize = 'Dimensione riga';
$strRowsStatistic = 'Statistiche righe';
-$strRunning = 'in esecuzione su ';
-$strRunningAs = 'come';
+$strRunning = 'in esecuzione su %s';
$strRunQuery = 'Invia Query';
$strRunSQLQuery = 'Esegui la/e query SQL sul database %s';
diff --git a/lang/japanese.inc.php3 b/lang/japanese.inc.php3
index 9e371361c..033c65506 100644
--- a/lang/japanese.inc.php3
+++ b/lang/japanese.inc.php3
@@ -193,7 +193,7 @@ $strRowLength = 'Row length'; //to translate
$strRows = 'Rows'; //to translate
$strRowsFrom = '³«»Ï¹Ô';
$strRowsStatistic = 'Row Statistic'; //to translate
-$strRunning = '¤¬¼Â¹ÔÃæ¤Ç¤¹¡£';
+$strRunning = '¤¬¼Â¹ÔÃæ¤Ç¤¹¡£ %';
$strRunQuery = 'Submit Query'; //to translate (tbl_qbe.php3)
$strSave = 'Êݸ';
@@ -295,6 +295,7 @@ $strKeepPass = 'Do not change the password';//to translate
$strLinesTerminatedBy = 'Lines terminated by';//to translate
$strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNbRecords = 'no. of records';
$strNoDatabases = 'No databases';
$strNoDropDatabases = '"DROP DATABASE" statements are disabled.';
@@ -306,7 +307,6 @@ $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strQueryOnDb = 'SQL-query on database ';
$strRowSize = ' Row size '; //to translate
-$strRunningAs = 'as';
$strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate
$strServerChoice = 'Server Choice';//to translate
$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/korean.inc.php3 b/lang/korean.inc.php3
index 7ae2c99c3..c75419bdd 100644
--- a/lang/korean.inc.php3
+++ b/lang/korean.inc.php3
@@ -193,7 +193,7 @@ $strRowLength = 'Row length'; //to translate
$strRows = 'Rows'; //to translate
$strRowsFrom = '°³½ÃÇà';
$strRowsStatistic = 'Row Statistic'; //to translate
-$strRunning = '°¡ ½ÇÇàÁßÀÔ´Ï´Ù. ';
+$strRunning = '°¡ ½ÇÇàÁßÀÔ´Ï´Ù. %s';
$strRunQuery = 'Submit Query'; //to translate (tbl_qbe.php3)
$strSave = 'º¸Á¸';
@@ -295,6 +295,7 @@ $strKeepPass = 'Do not change the password';//to translate
$strLinesTerminatedBy = 'Lines terminated by';//to translate
$strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNbRecords = 'no. of records';
$strNoDatabases = 'No databases';
$strNoDropDatabases = '"DROP DATABASE" statements are disabled.';
@@ -306,7 +307,6 @@ $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strQueryOnDb = 'SQL-query on database ';
$strRowSize = ' Row size '; //to translate
-$strRunningAs = 'as';
$strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate
$strServerChoice = 'Server Choice';//to translate
$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/norwegian.inc.php3 b/lang/norwegian.inc.php3
index a3b245687..0b9947ba4 100644
--- a/lang/norwegian.inc.php3
+++ b/lang/norwegian.inc.php3
@@ -179,6 +179,7 @@ $strMoveTable = 'Flytt tabell til (database.tabell):';
$strMoveTableOK = 'Tabellen %s har blitt flyttet til %s.';
$strMySQLReloaded = 'MySQL omstartet.';
$strMySQLSaid = 'MySQL sa: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% som kjører på %pma_s2% som %pma_s3%';
$strMySQLShowProcess = 'Vis prosesser';
$strMySQLShowStatus = 'Vis MySQL runtime informasjon';
$strMySQLShowVars = 'Vis MySQL systemvariabler';
@@ -255,8 +256,7 @@ $strRows = 'Rader';
$strRowsFrom = 'rader fra';
$strRowSize = ' Rad størelse ';
$strRowsStatistic = 'Rad statistikk';
-$strRunning = 'som kjører på ';
-$strRunningAs = 'som';
+$strRunning = 'som kjører på %s';
$strRunQuery = 'Kjør spørring';
$strRunSQLQuery = 'Kjør SQL spørring/spørringer mot databasen %s';
diff --git a/lang/portuguese.inc.php3 b/lang/portuguese.inc.php3
index e03ddc925..cc9c46b31 100644
--- a/lang/portuguese.inc.php3
+++ b/lang/portuguese.inc.php3
@@ -193,7 +193,7 @@ $strRowLength = 'Row length'; //to translate
$strRows = 'Rows'; //to translate
$strRowsFrom = 'rows starting from'; //to translate
$strRowsStatistic = 'Row Statistic'; //to translate
-$strRunning = 'Rodando em ';
+$strRunning = 'Rodando em %s';
$strRunQuery = 'Submit Query'; //to translate (tbl_qbe.php3)
$strSave = 'Salva';
@@ -295,6 +295,7 @@ $strKeepPass = 'Do not change the password';//to translate
$strLinesTerminatedBy = 'Lines terminated by';//to translate
$strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNbRecords = 'no. of records';
$strNoDatabases = 'No databases';
$strNoDropDatabases = '"DROP DATABASE" statements are disabled.';
@@ -306,7 +307,6 @@ $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strQueryOnDb = 'SQL-query on database ';
$strRowSize = ' Row size '; //to translate
-$strRunningAs = 'as';
$strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate
$strServerChoice = 'Server Choice';//to translate
$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/russian-koi8.inc.php3 b/lang/russian-koi8.inc.php3
index 8eb7283e0..d3849019f 100644
--- a/lang/russian-koi8.inc.php3
+++ b/lang/russian-koi8.inc.php3
@@ -180,6 +180,7 @@ $strMoveTable = '
$strMoveTableOK = 'ôÁÂÌÉÃÁ %s ÂÙÌÁ ÐÅÒÅÍÅÝÅÎÁ × %s.';
$strMySQLReloaded = 'MySQL ÐÅÒÅÚÁÇÒÕÖÅÎÁ.';
$strMySQLSaid = 'ïÔ×ÅÔ MySQL: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% ÎÁ %pma_s2% ËÁË %pma_s3%';
$strMySQLShowProcess = 'ðÏËÁÚÁÔØ ÐÒÏÃÅÓÓÙ';
$strMySQLShowStatus = 'ðÏËÁÚÁÔØ ÓÏÓÔÏÑÎÉÅ MySQL';
$strMySQLShowVars = 'ðÏËÁÚÁÔØ ÓÉÓÔÅÍÎÙÅ ÐÅÒÅÍÅÎÎÙÅ MySQL';
@@ -256,8 +257,7 @@ $strRows = '
$strRowsFrom = 'ÒÑÄÏ× ÏÔ';
$strRowSize = ' òÁÚÍÅÒ ÒÑÄÁ ';
$strRowsStatistic = 'óÔÁÔÉÓÔÉËÁ ÒÑÄÁ';
-$strRunning = 'ÎÁ ';
-$strRunningAs = 'ËÁË';
+$strRunning = 'ÎÁ %s';
$strRunQuery = '÷ÙÐÏÌÎÉÔØ úÁÐÒÏÓ';
$strRunSQLQuery = '÷ÙÐÏÌÎÉÔØ SQL ÚÁÐÒÏÓ(Ù) ÎÁ âä %Ù';
diff --git a/lang/russian-win1251.inc.php3 b/lang/russian-win1251.inc.php3
index 411a04e7c..ba11841be 100644
--- a/lang/russian-win1251.inc.php3
+++ b/lang/russian-win1251.inc.php3
@@ -180,6 +180,7 @@ $strMoveTable = '
$strMoveTableOK = 'Òàáëèöà %s áûëà ïåðåìåùåíà â %s.';
$strMySQLReloaded = 'MySQL ïåðåçàãðóæåíà.';
$strMySQLSaid = 'Îòâåò MySQL: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% íà %pma_s2% êàê %pma_s3%';
$strMySQLShowProcess = 'Ïîêàçàòü ïðîöåññû';
$strMySQLShowStatus = 'Ïîêàçàòü ñîñòîÿíèå MySQL';
$strMySQLShowVars = 'Ïîêàçàòü ñèñòåìíûå ïåðåìåííûå MySQL';
@@ -256,8 +257,7 @@ $strRows = '
$strRowsFrom = 'ðÿäîâ îò';
$strRowSize = ' Ðàçìåð ðÿäà ';
$strRowsStatistic = 'Ñòàòèñòèêà ðÿäà';
-$strRunning = 'íà ';
-$strRunningAs = 'êàê';
+$strRunning = 'íà %s';
$strRunQuery = 'Âûïîëíèòü Çàïðîñ';
$strRunSQLQuery = 'Âûïîëíèòü SQL çàïðîñ(û) íà ÁÄ %û';
diff --git a/lang/slovak-iso.inc.php3 b/lang/slovak-iso.inc.php3
index 57eac6964..ed70d6713 100644
--- a/lang/slovak-iso.inc.php3
+++ b/lang/slovak-iso.inc.php3
@@ -182,6 +182,7 @@ $strMoveTable = 'Presun
$strMoveTableOK = 'Tabuµka %s bola presunutá do %s.';
$strMySQLReloaded = 'MySQL znovu-naèítaná.';
$strMySQLSaid = 'MySQL hlási: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% be¾i na %pma_s2% ako %pma_s3%';
$strMySQLShowProcess = 'Zobrazi» procesy';
$strMySQLShowStatus = 'Zobrazi» MySQL informácie o behu';
$strMySQLShowVars = 'Zobrazi» MySQL systémové premenné';
@@ -258,8 +259,7 @@ $strRows = 'Riadkov';
$strRowsFrom = 'riadky zaèínajú od';
$strRowSize = ' Veµkos» riadku ';
$strRowsStatistic = '©tatistika riadku';
-$strRunning = 'be¾i na ';
-$strRunningAs = 'ako';
+$strRunning = 'be¾i na %s';
$strRunQuery = 'Odo¹li dotaz';
$strRunSQLQuery = 'Spusti» SQL dotaz/dotazy na databázu %s';
diff --git a/lang/spanish.inc.php3 b/lang/spanish.inc.php3
index a655caa0e..00c1d64f4 100644
--- a/lang/spanish.inc.php3
+++ b/lang/spanish.inc.php3
@@ -216,7 +216,7 @@ $strRows = 'Filas';
$strRowsFrom = 'filas empezando de';
$strRowSize = ' Tamaño de la fila ';
$strRowsStatistic = 'Estadisticas de la fila';
-$strRunning = 'ejecutandose on ';
+$strRunning = 'ejecutandose on %s';
$strRunQuery = 'Ejecutar Query';
$strSave = 'Grabar';
@@ -304,10 +304,10 @@ $strKeepPass = 'Do not change the password';//to translate
$strLinesTerminatedBy = 'Lines terminated by';//to translate
$strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNoFrames = 'phpMyAdmin is more friendly with a frames-capable browser.';
$strPartialText = 'Partial Texts';//to translate
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
-$strRunningAs = 'as';
$strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate
$strShowAll = 'Show all'; // to translate
$strShowCols = 'Show columns';
diff --git a/lang/swedish.inc.php3 b/lang/swedish.inc.php3
index 044d26097..84dbf59da 100644
--- a/lang/swedish.inc.php3
+++ b/lang/swedish.inc.php3
@@ -180,6 +180,7 @@ $strMoveTable = 'Flytta tabellen till (databas.tabell):';
$strMoveTableOK = 'Tabellen %s har flyttats till %s.';
$strMySQLReloaded = 'MySQL har startats om.';
$strMySQLSaid = 'MySQL sa: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% körs på %pma_s2% som %pma_s3%';
$strMySQLShowProcess = 'Visa processer';
$strMySQLShowStatus = 'Visa MySQL-körningsinformation';
$strMySQLShowVars = 'Visa MySQL:s systemvariabler';
@@ -256,8 +257,7 @@ $strRows = 'Rader';
$strRowsFrom = 'rader med början från';
$strRowSize = 'Radstorlek';
$strRowsStatistic = 'Radstatistik';
-$strRunning = 'körs på ';
-$strRunningAs = 'som';
+$strRunning = 'körs på %s';
$strRunQuery = 'Kör fråga';
$strRunSQLQuery = 'Kör SQL-fråga/frågor i databasen %s';
diff --git a/lang/thai.inc.php3 b/lang/thai.inc.php3
index d812e6dc5..abe69c842 100644
--- a/lang/thai.inc.php3
+++ b/lang/thai.inc.php3
@@ -193,7 +193,7 @@ $strRowLength = 'Row length'; //to translate
$strRows = 'Rows'; //to translate
$strRowsFrom = 'á¶Ç àÃÔèÁ¨Ò¡á¶Ç·Õè';
$strRowsStatistic = 'Row Statistic'; //to translate
-$strRunning = 'running on '; //to translate
+$strRunning = 'running on %s'; //to translate
$strRunQuery = 'Submit Query'; //to translate (tbl_qbe.php3)
$strSave = 'à¡çººÑ¹·Ö¡';
@@ -296,6 +296,7 @@ $strKeepPass = 'Do not change the password';//to translate
$strLinesTerminatedBy = 'Lines terminated by';//to translate
$strMoveTable = 'Move table to (database.table):';
$strMoveTableOK = 'Table %s has been moved to %s.';
+$strMySQLServerProcess = 'MySQL %pma_s1% running on %pma_s2% as %pma_s3%';
$strNbRecords = 'no. of records';
$strNoDatabases = 'No databases';
$strNoDropDatabases = '"DROP DATABASE" statements are disabled.';
@@ -307,7 +308,6 @@ $strPmaDocumentation = 'phpMyAdmin Documentation';//to translate
$strPrimaryKeyHasBeenDropped = 'The primary key has been dropped';//to translate
$strQueryOnDb = 'SQL-query on database ';
$strRowSize = ' Row size '; //to translate
-$strRunningAs = 'as';
$strRunSQLQuery = 'Run SQL query/queries on database %s';//to translate
$strServerChoice = 'Server Choice';//to translate
$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/turkish.inc.php3 b/lang/turkish.inc.php3
index 490e85c0c..b66790a27 100644
--- a/lang/turkish.inc.php3
+++ b/lang/turkish.inc.php3
@@ -180,6 +180,7 @@ $strMoveTable = 'Tabloyu (veritaban
$strMoveTableOK = '%s tablosu %s üzerine taþýndý.';
$strMySQLReloaded = 'MySQL yeniden yüklendi.';
$strMySQLSaid = 'MySQL çýktýsý: ';
+$strMySQLServerProcess = 'MySQL %pma_s1% -- çalýþtýðý ortam --) %pma_s2% çalýþtýðý sistem -- %pma_s3%';
$strMySQLShowProcess = 'Ýþlemleri göster';
$strMySQLShowStatus = 'MySQL çalýþma zamaný bilgisini göster';
$strMySQLShowVars = 'MySQL sistem deðiþkenlerini göster';
@@ -256,8 +257,7 @@ $strRows = 'Sat
$strRowsFrom = '(kayýt)baþlayacaðý kayýt :';
$strRowSize = ' Satýr boyutu ';
$strRowsStatistic = 'Satýr istatistiði';
-$strRunning = '-- çalýþtýðý ortam --)';
-$strRunningAs = 'çalýþtýðý sistem --';
+$strRunning = '-- çalýþtýðý ortam --) %s';
$strRunQuery = 'Sorguyu çalýþtýr';
$strRunSQLQuery = '%s veritabaný üzerinde sorgu/sorgular çalýþtýr';
diff --git a/main.php3 b/main.php3
index 84219895a..ef288d60b 100755
--- a/main.php3
+++ b/main.php3
@@ -45,19 +45,24 @@ echo "\n";
0) {
- $local_query = 'SELECT VERSION() as version, USER() as user';
- $res = mysql_query($local_query) or PMA_mysqlDie('', $local_query, FALSE, '');
- echo '
MySQL ' . mysql_result($res, 0, 'version') . ' ' . $strRunning . ' ' . $cfgServer['host']; - if (!empty($cfgServer['port'])) { - echo ':' . $cfgServer['port']; - } + $server_info = $cfgServer['host'] + . (empty($cfgServer['port']) ? '' : ':' . $cfgServer['port']); // loic1: skip this because it's not a so good idea to display sockets // used to everybody // if (!empty($cfgServer['socket']) && PMA_PHP_INT_VERSION >= 30010) { - // echo ':' . $cfgServer['socket']; + // $server_info .= ':' . $cfgServer['socket']; // } - echo ' ' . $strRunningAs . ' ' . mysql_result($res, 0, 'user') . '
' . $full_string . '