From 6ecfb039fc62811fc1191ca8cc11afc4638b0177 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Thu, 3 Jun 2004 10:20:28 +0000
Subject: [PATCH] Remove spaces from strServer, strDatabase

---
 ChangeLog                                    | 2 ++
 header.inc.php                               | 2 +-
 lang/afrikaans-iso-8859-1.inc.php            | 4 ++--
 lang/afrikaans-utf-8.inc.php                 | 4 ++--
 lang/albanian-iso-8859-1.inc.php             | 4 ++--
 lang/albanian-utf-8.inc.php                  | 4 ++--
 lang/arabic-utf-8.inc.php                    | 4 ++--
 lang/arabic-windows-1256.inc.php             | 4 ++--
 lang/azerbaijani-iso-8859-9.inc.php          | 4 ++--
 lang/azerbaijani-utf-8.inc.php               | 4 ++--
 lang/basque-iso-8859-1.inc.php               | 4 ++--
 lang/basque-utf-8.inc.php                    | 4 ++--
 lang/bosnian-utf-8.inc.php                   | 2 +-
 lang/bosnian-windows-1250.inc.php            | 2 +-
 lang/brazilian_portuguese-iso-8859-1.inc.php | 4 ++--
 lang/brazilian_portuguese-utf-8.inc.php      | 4 ++--
 lang/bulgarian-koi8-r.inc.php                | 2 +-
 lang/bulgarian-utf-8.inc.php                 | 2 +-
 lang/bulgarian-windows-1251.inc.php          | 2 +-
 lang/catalan-iso-8859-1.inc.php              | 4 ++--
 lang/catalan-utf-8.inc.php                   | 4 ++--
 lang/chinese_big5-utf-8.inc.php              | 2 +-
 lang/chinese_big5.inc.php                    | 2 +-
 lang/chinese_gb-utf-8.inc.php                | 4 ++--
 lang/chinese_gb.inc.php                      | 4 ++--
 lang/croatian-iso-8859-2.inc.php             | 4 ++--
 lang/croatian-utf-8.inc.php                  | 4 ++--
 lang/croatian-windows-1250.inc.php           | 4 ++--
 lang/czech-iso-8859-2.inc.php                | 4 ++--
 lang/czech-utf-8.inc.php                     | 4 ++--
 lang/czech-windows-1250.inc.php              | 4 ++--
 lang/danish-iso-8859-1.inc.php               | 4 ++--
 lang/danish-utf-8.inc.php                    | 4 ++--
 lang/dutch-iso-8859-1.inc.php                | 4 ++--
 lang/dutch-utf-8.inc.php                     | 4 ++--
 lang/english-iso-8859-1.inc.php              | 4 ++--
 lang/english-utf-8.inc.php                   | 4 ++--
 lang/estonian-iso-8859-1.inc.php             | 4 ++--
 lang/estonian-utf-8.inc.php                  | 4 ++--
 lang/finnish-iso-8859-1.inc.php              | 4 ++--
 lang/finnish-utf-8.inc.php                   | 4 ++--
 lang/french-iso-8859-1.inc.php               | 2 +-
 lang/french-utf-8.inc.php                    | 2 +-
 lang/galician-iso-8859-1.inc.php             | 4 ++--
 lang/galician-utf-8.inc.php                  | 4 ++--
 lang/georgian-utf-8.inc.php                  | 4 ++--
 lang/german-iso-8859-1.inc.php               | 2 +-
 lang/german-utf-8.inc.php                    | 2 +-
 lang/greek-iso-8859-7.inc.php                | 4 ++--
 lang/greek-utf-8.inc.php                     | 4 ++--
 lang/hebrew-iso-8859-8-i.inc.php             | 4 ++--
 lang/hindi-utf-8.inc.php                     | 2 +-
 lang/hungarian-iso-8859-2.inc.php            | 4 ++--
 lang/hungarian-utf-8.inc.php                 | 4 ++--
 lang/indonesian-iso-8859-1.inc.php           | 4 ++--
 lang/indonesian-utf-8.inc.php                | 4 ++--
 lang/italian-iso-8859-1.inc.php              | 4 ++--
 lang/italian-utf-8.inc.php                   | 4 ++--
 lang/japanese-euc.inc.php                    | 2 +-
 lang/japanese-sjis.inc.php                   | 2 +-
 lang/japanese-utf-8.inc.php                  | 2 +-
 lang/korean-euc-kr.inc.php                   | 4 ++--
 lang/korean-utf-8.inc.php                    | 4 ++--
 lang/latvian-utf-8.inc.php                   | 4 ++--
 lang/latvian-windows-1257.inc.php            | 4 ++--
 lang/lithuanian-utf-8.inc.php                | 4 ++--
 lang/lithuanian-windows-1257.inc.php         | 4 ++--
 lang/malay-iso-8859-1.inc.php                | 4 ++--
 lang/malay-utf-8.inc.php                     | 4 ++--
 lang/norwegian-iso-8859-1.inc.php            | 4 ++--
 lang/norwegian-utf-8.inc.php                 | 4 ++--
 lang/persian-utf-8.inc.php                   | 4 ++--
 lang/persian-windows-1256.inc.php            | 4 ++--
 lang/polish-iso-8859-2.inc.php               | 4 ++--
 lang/polish-utf-8.inc.php                    | 4 ++--
 lang/portuguese-iso-8859-1.inc.php           | 4 ++--
 lang/portuguese-utf-8.inc.php                | 4 ++--
 lang/romanian-iso-8859-1.inc.php             | 4 ++--
 lang/romanian-utf-8.inc.php                  | 4 ++--
 lang/russian-cp-866.inc.php                  | 4 ++--
 lang/russian-koi8-r.inc.php                  | 4 ++--
 lang/russian-utf-8.inc.php                   | 4 ++--
 lang/russian-windows-1251.inc.php            | 4 ++--
 lang/serbian_cyrillic-utf-8.inc.php          | 2 +-
 lang/serbian_cyrillic-windows-1251.inc.php   | 2 +-
 lang/serbian_latin-utf-8.inc.php             | 2 +-
 lang/serbian_latin-windows-1250.inc.php      | 2 +-
 lang/slovak-iso-8859-2.inc.php               | 4 ++--
 lang/slovak-utf-8.inc.php                    | 4 ++--
 lang/slovak-windows-1250.inc.php             | 4 ++--
 lang/slovenian-iso-8859-2.inc.php            | 4 ++--
 lang/slovenian-utf-8.inc.php                 | 4 ++--
 lang/slovenian-windows-1250.inc.php          | 4 ++--
 lang/spanish-iso-8859-1.inc.php              | 4 ++--
 lang/spanish-utf-8.inc.php                   | 4 ++--
 lang/swedish-iso-8859-1.inc.php              | 4 ++--
 lang/swedish-utf-8.inc.php                   | 4 ++--
 lang/thai-tis-620.inc.php                    | 4 ++--
 lang/thai-utf-8.inc.php                      | 4 ++--
 lang/turkish-iso-8859-9.inc.php              | 4 ++--
 lang/turkish-utf-8.inc.php                   | 4 ++--
 lang/ukrainian-utf-8.inc.php                 | 4 ++--
 lang/ukrainian-windows-1251.inc.php          | 4 ++--
 libraries/common.lib.php                     | 4 ++--
 104 files changed, 188 insertions(+), 186 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6e3fafe93..779386e48 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -13,6 +13,8 @@ $Source$
     * db_details.php, db_details_structure.php, css/phpmyadmin.css.php: CSSize
       error messages.
     * header.inc.php: Remove spaces before colons (bug #965594).
+    * lang/*, libraries/common.lib.php: Remove spaces from strServer,
+      strDatabase (needed for above fix).
 
 2004-06-02 Alexander M. Turek  <happybirthdaytome@derrabus.de>
     * db_details_db_info.php, tbl_properties_tbl_info.php: Table type is called
diff --git a/header.inc.php b/header.inc.php
index b27654da7..2529c8118 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -161,7 +161,7 @@ if (empty($GLOBALS['is_header_sent'])) {
                                                                    : ':' . $cfg['Server']['port']
                                                                   )
                        );
-        echo '<div class="server">' . sprintf($GLOBALS['strServer'],'') . ":\n"
+        echo '<div class="server">' . $GLOBALS['strServer'] . ":\n"
             . '<a href="' . $GLOBALS['cfg']['DefaultTabServer'] . '?' . PMA_generate_common_url() . '">' 
             . htmlspecialchars($server_info) . '</a>' . "\n"
             . '</div>' . "\n\n";
diff --git a/lang/afrikaans-iso-8859-1.inc.php b/lang/afrikaans-iso-8859-1.inc.php
index 6961fb7c0..06d39b20d 100644
--- a/lang/afrikaans-iso-8859-1.inc.php
+++ b/lang/afrikaans-iso-8859-1.inc.php
@@ -103,7 +103,7 @@ $strCreatePdfFeat = 'Skepping van PDF\'s';
 $strCriteria = 'Kriteria';
 
 $strData = 'Data';
-$strDatabase = 'Databasis ';
+$strDatabase = 'Databasis';
 $strDatabaseHasBeenDropped = 'Databasis %s is verwyder.';
 $strDatabases = 'databasisse';
 $strDatabasesStats = 'Databasis statistieke';
@@ -432,7 +432,7 @@ $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
+$strServer = 'Server';  //to translate
 $strPutColNames = 'Put fields names at first row';  //to translate
 $strImportDocSQL = 'Import docSQL Files';  //to translate
 $strDataDict = 'Data Dictionary';  //to translate
diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php
index c806e5418..cc63774ad 100644
--- a/lang/afrikaans-utf-8.inc.php
+++ b/lang/afrikaans-utf-8.inc.php
@@ -104,7 +104,7 @@ $strCreatePdfFeat = 'Skepping van PDF\'s';
 $strCriteria = 'Kriteria';
 
 $strData = 'Data';
-$strDatabase = 'Databasis ';
+$strDatabase = 'Databasis';
 $strDatabaseHasBeenDropped = 'Databasis %s is verwyder.';
 $strDatabases = 'databasisse';
 $strDatabasesStats = 'Databasis statistieke';
@@ -433,7 +433,7 @@ $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
+$strServer = 'Server';  //to translate
 $strPutColNames = 'Put fields names at first row';  //to translate
 $strImportDocSQL = 'Import docSQL Files';  //to translate
 $strDataDict = 'Data Dictionary';  //to translate
diff --git a/lang/albanian-iso-8859-1.inc.php b/lang/albanian-iso-8859-1.inc.php
index 590f83ddf..697ec83bd 100644
--- a/lang/albanian-iso-8859-1.inc.php
+++ b/lang/albanian-iso-8859-1.inc.php
@@ -162,7 +162,7 @@ $strDanish = 'Danisht';
 $strData = 'T� dh�na';
 $strDataDict = 'Data Dictionary';
 $strDataOnly = 'Vet�m t� dh�na';
-$strDatabase = 'Databaz� ';
+$strDatabase = 'Databaz�';
 $strDatabaseExportOptions = 'Opcione t� eksportimit t� databaz�s';
 $strDatabaseHasBeenDropped = 'Databaza %s u eleminua.';
 $strDatabaseNoTable = 'Kjo databaz� nuk p�rmban tabela!';
@@ -567,7 +567,7 @@ $strSelectNumRows = 'tek query';
 $strSelectTables = 'Zgjidh Tabelat';
 $strSend = 'Ruaje me em�r...';
 $strSent = 'D�rguar';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Zgjedhja e server';
 $strServerStatus = 'Informacione mbi Runtime';
 $strServerStatusUptime = 'Ky server server MySQL po punon q� prej %s. U nis m� %s.';
diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php
index a7a1d735a..6cf3dadc9 100644
--- a/lang/albanian-utf-8.inc.php
+++ b/lang/albanian-utf-8.inc.php
@@ -163,7 +163,7 @@ $strDanish = 'Danisht';
 $strData = 'Të dhëna';
 $strDataDict = 'Data Dictionary';
 $strDataOnly = 'Vetëm të dhëna';
-$strDatabase = 'Databazë ';
+$strDatabase = 'Databazë';
 $strDatabaseExportOptions = 'Opcione të eksportimit të databazës';
 $strDatabaseHasBeenDropped = 'Databaza %s u eleminua.';
 $strDatabaseNoTable = 'Kjo databazë nuk përmban tabela!';
@@ -568,7 +568,7 @@ $strSelectNumRows = 'tek query';
 $strSelectTables = 'Zgjidh Tabelat';
 $strSend = 'Ruaje me emër...';
 $strSent = 'Dërguar';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Zgjedhja e server';
 $strServerStatus = 'Informacione mbi Runtime';
 $strServerStatusUptime = 'Ky server server MySQL po punon që prej %s. U nis më %s.';
diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php
index 2e2751018..f59498ec8 100644
--- a/lang/arabic-utf-8.inc.php
+++ b/lang/arabic-utf-8.inc.php
@@ -172,7 +172,7 @@ $strDanish = 'ÇهÏوځعنٌÉ';
 $strData = 'ÈٌÇوÇÊ';
 $strDataDict = 'مÇځيـ ÇهÈٌÇوÇÊ';
 $strDataOnly = 'ÈٌÇوÇÊ لمك';
-$strDatabase = 'مÇگÏÉ ÇهÈٌÇوÇÊ ';
+$strDatabase = 'مÇگÏÉ ÇهÈٌÇوÇÊ';
 $strDatabaseExportOptions = 'ÎٌÇعÇÊ ÊفÏٌع مÇگÏÉ ÈٌÇوÇÊ';
 $strDatabaseHasBeenDropped = 'مÇگÏÉ ÈٌÇوÇÊ %s ځطㄓيلى.';
 $strDatabaseNoTable = 'هÇ ÊطÊيٌ مÇگÏÉ ÇهÈٌÇوÇÊ ىㄓى گهً ضÏÇيه!';
@@ -581,7 +581,7 @@ $strSelectNumRows = 'لٌ ÇهشـÊگهÇځ';
 $strSelectTables = 'شÎÊع ÇهضÏÇيه';
 $strSend = 'طلÙ نځهل';
 $strSent = 'ژّعـْه';
-$strServer = 'ÎÇÏځ %s';
+$strServer = 'ÎÇÏځ';
 $strServerChoice = 'شÎÊٌÇع ÇهÎÇÏځ';
 $strServerStatus = 'ÈٌÇوÇÊ ÇهÊÔÛٌه';
 $strServerStatusUptime = 'ځقً گهً گځه ÎÇÏځ MySQL ځÏÉ %s. ÈÏژ Çهگځه لٌ %s.';
diff --git a/lang/arabic-windows-1256.inc.php b/lang/arabic-windows-1256.inc.php
index 400c1812e..afcbc3197 100644
--- a/lang/arabic-windows-1256.inc.php
+++ b/lang/arabic-windows-1256.inc.php
@@ -171,7 +171,7 @@ $strDanish = '
 $strData = '������';
 $strDataDict = '����� ��������';
 $strDataOnly = '������ ���';
-$strDatabase = '����� �������� ';
+$strDatabase = '����� ��������';
 $strDatabaseExportOptions = '������ ����� ����� ������';
 $strDatabaseHasBeenDropped = '����� ������ %s ������.';
 $strDatabaseNoTable = '�� ����� ����� �������� ��� ��� �����!';
@@ -580,7 +580,7 @@ $strSelectNumRows = '
 $strSelectTables = '���� �������';
 $strSend = '��� ����';
 $strSent = '������';
-$strServer = '���� %s';
+$strServer = '����';
 $strServerChoice = '������ ������';
 $strServerStatus = '������ �������';
 $strServerStatusUptime = '��� ��� ��� ���� MySQL ��� %s. ��� ����� �� %s.';
diff --git a/lang/azerbaijani-iso-8859-9.inc.php b/lang/azerbaijani-iso-8859-9.inc.php
index 90017e153..0d38bfd18 100644
--- a/lang/azerbaijani-iso-8859-9.inc.php
+++ b/lang/azerbaijani-iso-8859-9.inc.php
@@ -140,7 +140,7 @@ $strDBGTotalTimeMs = 'Toplam m
 $strData = 'Me\'lumat';
 $strDataDict = 'Me\'lumat L��eti (Data Dictionary)';
 $strDataOnly = 'Sadece me\'lumat';
-$strDatabase = 'Me\'lumat Bazas� ';
+$strDatabase = 'Me\'lumat Bazas�';
 $strDatabaseHasBeenDropped = '%s bazas� le�v edildi.';
 $strDatabaseWildcard = 'Me\'lumat Bazas� (wildcard-lara icaze var):';
 $strDatabases = 'Me\'lumat bazalar�';
@@ -513,7 +513,7 @@ $strSelectNumRows = 'in query';
 $strSelectTables = 'Select Tables';
 $strSend = 'Fayl olaraq qeyd et';
 $strSent = 'G�nderildi';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Server Se�imi';
 $strServerStatus = 'Runtime Me\'lumat�';
 $strServerStatusUptime = 'This MySQL server has been running for %s. It started up on %s.';
diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php
index e17a9a4fe..7648300a4 100644
--- a/lang/azerbaijani-utf-8.inc.php
+++ b/lang/azerbaijani-utf-8.inc.php
@@ -141,7 +141,7 @@ $strDBGTotalTimeMs = 'Toplam müddet, ms';
 $strData = 'Me\'lumat';
 $strDataDict = 'Me\'lumat Lüğeti (Data Dictionary)';
 $strDataOnly = 'Sadece me\'lumat';
-$strDatabase = 'Me\'lumat Bazası ';
+$strDatabase = 'Me\'lumat Bazası';
 $strDatabaseHasBeenDropped = '%s bazası leğv edildi.';
 $strDatabaseWildcard = 'Me\'lumat Bazası (wildcard-lara icaze var):';
 $strDatabases = 'Me\'lumat bazaları';
@@ -514,7 +514,7 @@ $strSelectNumRows = 'in query';
 $strSelectTables = 'Select Tables';
 $strSend = 'Fayl olaraq qeyd et';
 $strSent = 'Gönderildi';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Server Seçimi';
 $strServerStatus = 'Runtime Me\'lumatı';
 $strServerStatusUptime = 'This MySQL server has been running for %s. It started up on %s.';
diff --git a/lang/basque-iso-8859-1.inc.php b/lang/basque-iso-8859-1.inc.php
index bc7c16237..02b5eaf3d 100644
--- a/lang/basque-iso-8859-1.inc.php
+++ b/lang/basque-iso-8859-1.inc.php
@@ -162,7 +162,7 @@ $strDanish = 'Danesa';
 $strData = 'Datuak';
 $strDataDict = 'Datu-hiztegia';
 $strDataOnly = 'Datuak soilik';
-$strDatabase = 'Datu-basea ';
+$strDatabase = 'Datu-basea';
 $strDatabaseExportOptions = 'Datu-basea esportatzeko aukerak';
 $strDatabaseHasBeenDropped = '%s datu-basea ezabatua izan da.';
 $strDatabaseNoTable = 'Datu-base honek ez dauka taularik!';
@@ -567,7 +567,7 @@ $strSelectNumRows = 'kontsultan';
 $strSelectTables = 'Taulak hautatu';
 $strSend = 'Bidali';
 $strSent = 'Bidalita';
-$strServer = '%s zerbitzaria';
+$strServer = 'Zerbitzaria';
 $strServerChoice = 'Zerbitzariaren hautaketa';
 $strServerStatusUptime = 'MySQL zerbitzari hau martxan egon da %s. %s abiaratu zelarik.';
 $strServerTabProcesslist = 'Prozesuak';
diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php
index 0df897be8..80b3bfd75 100644
--- a/lang/basque-utf-8.inc.php
+++ b/lang/basque-utf-8.inc.php
@@ -163,7 +163,7 @@ $strDanish = 'Danesa';
 $strData = 'Datuak';
 $strDataDict = 'Datu-hiztegia';
 $strDataOnly = 'Datuak soilik';
-$strDatabase = 'Datu-basea ';
+$strDatabase = 'Datu-basea';
 $strDatabaseExportOptions = 'Datu-basea esportatzeko aukerak';
 $strDatabaseHasBeenDropped = '%s datu-basea ezabatua izan da.';
 $strDatabaseNoTable = 'Datu-base honek ez dauka taularik!';
@@ -568,7 +568,7 @@ $strSelectNumRows = 'kontsultan';
 $strSelectTables = 'Taulak hautatu';
 $strSend = 'Bidali';
 $strSent = 'Bidalita';
-$strServer = '%s zerbitzaria';
+$strServer = 'Zerbitzaria';
 $strServerChoice = 'Zerbitzariaren hautaketa';
 $strServerStatusUptime = 'MySQL zerbitzari hau martxan egon da %s. %s abiaratu zelarik.';
 $strServerTabProcesslist = 'Prozesuak';
diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php
index e750fc730..2ae7244d4 100644
--- a/lang/bosnian-utf-8.inc.php
+++ b/lang/bosnian-utf-8.inc.php
@@ -558,7 +558,7 @@ $strSelectNumRows = 'u upitu';
 $strSelectTables = 'Izaberi tabele';
 $strSend = 'Sačuvaj kao datoteku';
 $strSent = 'Poslato';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Izbor servera';
 $strServerStatus = 'Informacije o toku rada';
 $strServerStatusUptime = 'Ovaj MySQL server radi već %s. Pokrenut je %s.';
diff --git a/lang/bosnian-windows-1250.inc.php b/lang/bosnian-windows-1250.inc.php
index 7a65002dc..e4e6c5d68 100644
--- a/lang/bosnian-windows-1250.inc.php
+++ b/lang/bosnian-windows-1250.inc.php
@@ -557,7 +557,7 @@ $strSelectNumRows = 'u upitu';
 $strSelectTables = 'Izaberi tabele';
 $strSend = 'Sa�uvaj kao datoteku';
 $strSent = 'Poslato';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Izbor servera';
 $strServerStatus = 'Informacije o toku rada';
 $strServerStatusUptime = 'Ovaj MySQL server radi ve� %s. Pokrenut je %s.';
diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php b/lang/brazilian_portuguese-iso-8859-1.inc.php
index 2f8cc5de1..2ba3a3855 100644
--- a/lang/brazilian_portuguese-iso-8859-1.inc.php
+++ b/lang/brazilian_portuguese-iso-8859-1.inc.php
@@ -86,7 +86,7 @@ $strCreateNewTable = 'Cria nova tabela no banco de dados %s';
 $strCriteria = 'Crit�rio';
 
 $strData = 'Dados';
-$strDatabase = 'Banco de Dados ';
+$strDatabase = 'Banco de Dados';
 $strDatabaseHasBeenDropped = 'Base de Dados %s foi eliminada.';
 $strDatabases = 'Banco de Dados';
 $strDatabasesStats = 'Estatisticas da base';
@@ -446,7 +446,7 @@ $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
+$strServer = 'Server';  //to translate
 $strPutColNames = 'Put fields names at first row';  //to translate
 $strImportDocSQL = 'Import docSQL Files';  //to translate
 $strDataDict = 'Data Dictionary';  //to translate
diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php
index 01ddb1cfd..ae84848f9 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -87,7 +87,7 @@ $strCreateNewTable = 'Cria nova tabela no banco de dados %s';
 $strCriteria = 'Critério';
 
 $strData = 'Dados';
-$strDatabase = 'Banco de Dados ';
+$strDatabase = 'Banco de Dados';
 $strDatabaseHasBeenDropped = 'Base de Dados %s foi eliminada.';
 $strDatabases = 'Banco de Dados';
 $strDatabasesStats = 'Estatisticas da base';
@@ -447,7 +447,7 @@ $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
+$strServer = 'Server';  //to translate
 $strPutColNames = 'Put fields names at first row';  //to translate
 $strImportDocSQL = 'Import docSQL Files';  //to translate
 $strDataDict = 'Data Dictionary';  //to translate
diff --git a/lang/bulgarian-koi8-r.inc.php b/lang/bulgarian-koi8-r.inc.php
index 832e9ed63..379c30ebc 100644
--- a/lang/bulgarian-koi8-r.inc.php
+++ b/lang/bulgarian-koi8-r.inc.php
@@ -579,7 +579,7 @@ $strSelectNumRows = '
 $strSelectTables = '������ �������';
 $strSend = '�������';
 $strSent = '���������';
-$strServer = '������ %s';
+$strServer = '������';
 $strServerChoice = '����� �� ������';
 $strServerStatus = '���������� �� ����������� �� MySQL �������';
 $strServerStatusUptime = '���� MySQL ������ ������ �� %s. ��������� � �� %s.';
diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php
index d87adf168..892cb75ad 100644
--- a/lang/bulgarian-utf-8.inc.php
+++ b/lang/bulgarian-utf-8.inc.php
@@ -580,7 +580,7 @@ $strSelectNumRows = 'в запитването';
 $strSelectTables = 'Избери таблици';
 $strSend = 'Изпрати';
 $strSent = 'Изпратени';
-$strServer = 'Сървър %s';
+$strServer = 'Сървър';
 $strServerChoice = 'Избор на сървър';
 $strServerStatus = 'Информация за състоянието на MySQL сървъра';
 $strServerStatusUptime = 'Този MySQL сървър работи от %s. Стартиран е на %s.';
diff --git a/lang/bulgarian-windows-1251.inc.php b/lang/bulgarian-windows-1251.inc.php
index 41aa2f55c..b6da78a42 100644
--- a/lang/bulgarian-windows-1251.inc.php
+++ b/lang/bulgarian-windows-1251.inc.php
@@ -579,7 +579,7 @@ $strSelectNumRows = '
 $strSelectTables = '������ �������';
 $strSend = '�������';
 $strSent = '���������';
-$strServer = '������ %s';
+$strServer = '������';
 $strServerChoice = '����� �� ������';
 $strServerStatus = '���������� �� ����������� �� MySQL �������';
 $strServerStatusUptime = '���� MySQL ������ ������ �� %s. ��������� � �� %s.';
diff --git a/lang/catalan-iso-8859-1.inc.php b/lang/catalan-iso-8859-1.inc.php
index a26578d5d..0c612cfe7 100644
--- a/lang/catalan-iso-8859-1.inc.php
+++ b/lang/catalan-iso-8859-1.inc.php
@@ -165,7 +165,7 @@ $strDanish = 'Dan
 $strData = 'Dades';
 $strDataDict = 'Diccionari de Dades';
 $strDataOnly = 'Nom�s dades';
-$strDatabase = 'Base de dades ';
+$strDatabase = 'Base de dades';
 $strDatabaseExportOptions = 'Opcions d\'exportaci� de Bases de Dades';
 $strDatabaseHasBeenDropped = 'La Base de Dades %s s\'ha eliminat.';
 $strDatabaseNoTable = 'Aquesta base de dades no t� taules!';
@@ -577,7 +577,7 @@ $strSelectNumRows = 'en consulta';
 $strSelectTables = 'Selecciona Taules';
 $strSend = 'enviar';
 $strSent = 'Enviat';
-$strServer = 'Servidor %s';
+$strServer = 'Servidor';
 $strServerChoice = 'Elecci� de Servidor';
 $strServerStatus = 'Informaci� d\'execuci�';
 $strServerStatusUptime = 'Aquest servidor MySQL �s en marxa durant %s. Es va iniciar en %s.';
diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php
index a6b20e71e..6abce362e 100644
--- a/lang/catalan-utf-8.inc.php
+++ b/lang/catalan-utf-8.inc.php
@@ -166,7 +166,7 @@ $strDanish = 'Danès';
 $strData = 'Dades';
 $strDataDict = 'Diccionari de Dades';
 $strDataOnly = 'Només dades';
-$strDatabase = 'Base de dades ';
+$strDatabase = 'Base de dades';
 $strDatabaseExportOptions = 'Opcions d\'exportació de Bases de Dades';
 $strDatabaseHasBeenDropped = 'La Base de Dades %s s\'ha eliminat.';
 $strDatabaseNoTable = 'Aquesta base de dades no té taules!';
@@ -578,7 +578,7 @@ $strSelectNumRows = 'en consulta';
 $strSelectTables = 'Selecciona Taules';
 $strSend = 'enviar';
 $strSent = 'Enviat';
-$strServer = 'Servidor %s';
+$strServer = 'Servidor';
 $strServerChoice = 'Elecció de Servidor';
 $strServerStatus = 'Informació d\'execució';
 $strServerStatusUptime = 'Aquest servidor MySQL és en marxa durant %s. Es va iniciar en %s.';
diff --git a/lang/chinese_big5-utf-8.inc.php b/lang/chinese_big5-utf-8.inc.php
index 1eac656ba..532c77653 100644
--- a/lang/chinese_big5-utf-8.inc.php
+++ b/lang/chinese_big5-utf-8.inc.php
@@ -579,7 +579,7 @@ $strSelectNumRows = '查詢中';
 $strSelectTables = '選擇資料表';
 $strSend = '下載儲存';
 $strSent = '送出';
-$strServer = '伺服器 %s';
+$strServer = '伺服器';
 $strServerChoice = '選擇伺服器';
 $strServerStatus = '運行資訊';
 $strServerStatusUptime = '這 MySQL 伺服器已啟動了 %s. 伺服器於 %s 啟動.';
diff --git a/lang/chinese_big5.inc.php b/lang/chinese_big5.inc.php
index a597e143a..1397cd21c 100644
--- a/lang/chinese_big5.inc.php
+++ b/lang/chinese_big5.inc.php
@@ -578,7 +578,7 @@ $strSelectNumRows = '
 $strSelectTables = '��ܸ�ƪ�';
 $strSend = '�U���x�s';
 $strSent = '�e�X';
-$strServer = '���A�� %s';
+$strServer = '���A��';
 $strServerChoice = '��ܦ��A��';
 $strServerStatus = '�B���T';
 $strServerStatusUptime = '�o MySQL ���A���w�ҰʤF %s. ���A���� %s �Ұ�.';
diff --git a/lang/chinese_gb-utf-8.inc.php b/lang/chinese_gb-utf-8.inc.php
index 7b6a82bb3..ebe6280d9 100644
--- a/lang/chinese_gb-utf-8.inc.php
+++ b/lang/chinese_gb-utf-8.inc.php
@@ -161,7 +161,7 @@ $strDanish = '丹麦语';
 $strData = '数据';
 $strDataDict = '数据字典';
 $strDataOnly = '只有数据';
-$strDatabase = '数据库 ';
+$strDatabase = '数据库';
 $strDatabaseExportOptions = '数据库导出选项';
 $strDatabaseHasBeenDropped = '数据库 %s 已被删除。';
 $strDatabaseNoTable = '此数据库中没有表!';
@@ -556,7 +556,7 @@ $strSelectNumRows = '查询中';
 $strSelectTables = '选择表';
 $strSend = '另存为文件';
 $strSent = '送出';
-$strServer = '服务器 %s';
+$strServer = '服务器';
 $strServerChoice = '选择服务器';
 $strServerStatus = '运行信息';
 $strServerStatusUptime = '此 MySQL 服务器已经运行了 %s，启动时间为 %s。';
diff --git a/lang/chinese_gb.inc.php b/lang/chinese_gb.inc.php
index 3ece22a1f..95fadf1b9 100644
--- a/lang/chinese_gb.inc.php
+++ b/lang/chinese_gb.inc.php
@@ -160,7 +160,7 @@ $strDanish = '
 $strData = '����';
 $strDataDict = '�����ֵ�';
 $strDataOnly = 'ֻ������';
-$strDatabase = '���ݿ� ';
+$strDatabase = '���ݿ�';
 $strDatabaseExportOptions = '���ݿ⵼��ѡ��';
 $strDatabaseHasBeenDropped = '���ݿ� %s �ѱ�ɾ����';
 $strDatabaseNoTable = '�����ݿ���û�б�!';
@@ -555,7 +555,7 @@ $strSelectNumRows = '
 $strSelectTables = 'ѡ���';
 $strSend = '����Ϊ�ļ�';
 $strSent = '�ͳ�';
-$strServer = '������ %s';
+$strServer = '������';
 $strServerChoice = 'ѡ�������';
 $strServerStatus = '������Ϣ';
 $strServerStatusUptime = '�� MySQL �������Ѿ������� %s������ʱ��Ϊ %s��';
diff --git a/lang/croatian-iso-8859-2.inc.php b/lang/croatian-iso-8859-2.inc.php
index 814cf829d..5d94078af 100644
--- a/lang/croatian-iso-8859-2.inc.php
+++ b/lang/croatian-iso-8859-2.inc.php
@@ -86,7 +86,7 @@ $strCreateNewTable = 'Napravi novu tablicu u bazi ';
 $strCriteria = 'Kriterij';
 
 $strData = 'Podaci';
-$strDatabase = 'Baza podataka ';
+$strDatabase = 'Baza podataka';
 $strDatabaseHasBeenDropped = 'Baza %s je izbrisana.';
 $strDatabases = 'baze';
 $strDatabasesStats = 'Statistika baze';
@@ -445,7 +445,7 @@ $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
+$strServer = 'Server';  //to translate
 $strPutColNames = 'Put fields names at first row';  //to translate
 $strImportDocSQL = 'Import docSQL Files';  //to translate
 $strDataDict = 'Data Dictionary';  //to translate
diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php
index 36c1bcd07..a9ce6ebdf 100644
--- a/lang/croatian-utf-8.inc.php
+++ b/lang/croatian-utf-8.inc.php
@@ -87,7 +87,7 @@ $strCreateNewTable = 'Napravi novu tablicu u bazi ';
 $strCriteria = 'Kriterij';
 
 $strData = 'Podaci';
-$strDatabase = 'Baza podataka ';
+$strDatabase = 'Baza podataka';
 $strDatabaseHasBeenDropped = 'Baza %s je izbrisana.';
 $strDatabases = 'baze';
 $strDatabasesStats = 'Statistika baze';
@@ -446,7 +446,7 @@ $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
+$strServer = 'Server';  //to translate
 $strPutColNames = 'Put fields names at first row';  //to translate
 $strImportDocSQL = 'Import docSQL Files';  //to translate
 $strDataDict = 'Data Dictionary';  //to translate
diff --git a/lang/croatian-windows-1250.inc.php b/lang/croatian-windows-1250.inc.php
index 4afba0c8f..de8f591b4 100644
--- a/lang/croatian-windows-1250.inc.php
+++ b/lang/croatian-windows-1250.inc.php
@@ -86,7 +86,7 @@ $strCreateNewTable = 'Napravi novu tablicu u bazi ';
 $strCriteria = 'Kriterij';
 
 $strData = 'Podaci';
-$strDatabase = 'Baza podataka ';
+$strDatabase = 'Baza podataka';
 $strDatabaseHasBeenDropped = 'Baza %s je izbrisana.';
 $strDatabases = 'baze';
 $strDatabasesStats = 'Statistika baze';
@@ -445,7 +445,7 @@ $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
+$strServer = 'Server';  //to translate
 $strPutColNames = 'Put fields names at first row';  //to translate
 $strImportDocSQL = 'Import docSQL Files';  //to translate
 $strDataDict = 'Data Dictionary';  //to translate
diff --git a/lang/czech-iso-8859-2.inc.php b/lang/czech-iso-8859-2.inc.php
index e6fa04a44..7a618a108 100644
--- a/lang/czech-iso-8859-2.inc.php
+++ b/lang/czech-iso-8859-2.inc.php
@@ -177,7 +177,7 @@ $strDanish = 'D
 $strData = 'Data';
 $strDataDict = 'Datov� slovn�k';
 $strDataOnly = ' Jen data';
-$strDatabase = 'Datab�ze ';
+$strDatabase = 'Datab�ze';
 $strDatabaseEmpty = 'Jm�no datab�ze je pr�zdn�!';
 $strDatabaseExportOptions = 'Nastaven� exportu datab�z�';
 $strDatabaseHasBeenDropped = 'Datab�ze %s byla zru�ena.';
@@ -601,7 +601,7 @@ $strSelectNumRows = 'v&nbsp;dotazu';
 $strSelectTables = 'Vybrat tabulky';
 $strSend = 'Do souboru';
 $strSent = 'Odesl�no';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'V�b�r serveru';
 $strServerStatus = 'Stav serveru';
 $strServerStatusUptime = 'Tento MySQL server b�� %s. �as spu�t�n�: %s.';
diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php
index 7cc94d91e..7288feeac 100644
--- a/lang/czech-utf-8.inc.php
+++ b/lang/czech-utf-8.inc.php
@@ -178,7 +178,7 @@ $strDanish = 'Dánsky';
 $strData = 'Data';
 $strDataDict = 'Datový slovník';
 $strDataOnly = ' Jen data';
-$strDatabase = 'Databáze ';
+$strDatabase = 'Databáze';
 $strDatabaseEmpty = 'Jméno databáze je prázdné!';
 $strDatabaseExportOptions = 'Nastavení exportu databází';
 $strDatabaseHasBeenDropped = 'Databáze %s byla zrušena.';
@@ -602,7 +602,7 @@ $strSelectNumRows = 'v&nbsp;dotazu';
 $strSelectTables = 'Vybrat tabulky';
 $strSend = 'Do souboru';
 $strSent = 'Odesláno';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Výběr serveru';
 $strServerStatus = 'Stav serveru';
 $strServerStatusUptime = 'Tento MySQL server běží %s. Čas spuštění: %s.';
diff --git a/lang/czech-windows-1250.inc.php b/lang/czech-windows-1250.inc.php
index f3aa80968..6ed5a270f 100644
--- a/lang/czech-windows-1250.inc.php
+++ b/lang/czech-windows-1250.inc.php
@@ -177,7 +177,7 @@ $strDanish = 'D
 $strData = 'Data';
 $strDataDict = 'Datov� slovn�k';
 $strDataOnly = ' Jen data';
-$strDatabase = 'Datab�ze ';
+$strDatabase = 'Datab�ze';
 $strDatabaseEmpty = 'Jm�no datab�ze je pr�zdn�!';
 $strDatabaseExportOptions = 'Nastaven� exportu datab�z�';
 $strDatabaseHasBeenDropped = 'Datab�ze %s byla zru�ena.';
@@ -601,7 +601,7 @@ $strSelectNumRows = 'v&nbsp;dotazu';
 $strSelectTables = 'Vybrat tabulky';
 $strSend = 'Do souboru';
 $strSent = 'Odesl�no';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'V�b�r serveru';
 $strServerStatus = 'Stav serveru';
 $strServerStatusUptime = 'Tento MySQL server b�� %s. �as spu�t�n�: %s.';
diff --git a/lang/danish-iso-8859-1.inc.php b/lang/danish-iso-8859-1.inc.php
index b5d679f37..54acc9942 100644
--- a/lang/danish-iso-8859-1.inc.php
+++ b/lang/danish-iso-8859-1.inc.php
@@ -165,7 +165,7 @@ $strDanish = 'Dansk';
 $strData = 'Data';
 $strDataDict = 'Data Dictionary';
 $strDataOnly = 'Kun data';
-$strDatabase = 'Database: ';
+$strDatabase = 'Database:';
 $strDatabaseExportOptions = 'Database eksport indstillinger';
 $strDatabaseHasBeenDropped = 'Database %s er slettet.';
 $strDatabaseNoTable = 'Denne database indeholder ikke nogen tabel!';
@@ -576,7 +576,7 @@ $strSelectNumRows = 'i foresp
 $strSelectTables = 'V�lg Tabeller';       
 $strSend = 'Send (download)';
 $strSent = 'Sendt';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Server valg';
 $strServerStatus = 'Runtime Information';
 $strServerStatusUptime = 'Denne MySQL-server har k�rt i %s. Den startede op den %s.';
diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php
index 847e87294..7c08ec3db 100644
--- a/lang/danish-utf-8.inc.php
+++ b/lang/danish-utf-8.inc.php
@@ -166,7 +166,7 @@ $strDanish = 'Dansk';
 $strData = 'Data';
 $strDataDict = 'Data Dictionary';
 $strDataOnly = 'Kun data';
-$strDatabase = 'Database: ';
+$strDatabase = 'Database:';
 $strDatabaseExportOptions = 'Database eksport indstillinger';
 $strDatabaseHasBeenDropped = 'Database %s er slettet.';
 $strDatabaseNoTable = 'Denne database indeholder ikke nogen tabel!';
@@ -577,7 +577,7 @@ $strSelectNumRows = 'i forespørgsel';
 $strSelectTables = 'Vælg Tabeller';       
 $strSend = 'Send (download)';
 $strSent = 'Sendt';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Server valg';
 $strServerStatus = 'Runtime Information';
 $strServerStatusUptime = 'Denne MySQL-server har kørt i %s. Den startede op den %s.';
diff --git a/lang/dutch-iso-8859-1.inc.php b/lang/dutch-iso-8859-1.inc.php
index 23655b463..daf867e0c 100644
--- a/lang/dutch-iso-8859-1.inc.php
+++ b/lang/dutch-iso-8859-1.inc.php
@@ -175,7 +175,7 @@ $strDanish = 'Deens';
 $strData = 'Data';
 $strDataDict = 'Data Woordenboek';
 $strDataOnly = 'Alleen data';
-$strDatabase = 'Database ';
+$strDatabase = 'Database';
 $strDatabaseEmpty = 'De database naam is leeg!';
 $strDatabaseExportOptions = 'Database export opties';
 $strDatabaseHasBeenDropped = 'Database %s is vervallen.';
@@ -597,7 +597,7 @@ $strSelectNumRows = 'in query';
 $strSelectTables = 'Selecteer tabellen';
 $strSend = 'verzenden';
 $strSent = 'Verzonden';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Server keuze';
 $strServerStatus = 'Runtime Informatie';
 $strServerStatusUptime = 'Deze MySQL server draait inmiddels %s. Hij is gestart op %s.';
diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php
index 2562bd2a1..19b9970ad 100644
--- a/lang/dutch-utf-8.inc.php
+++ b/lang/dutch-utf-8.inc.php
@@ -176,7 +176,7 @@ $strDanish = 'Deens';
 $strData = 'Data';
 $strDataDict = 'Data Woordenboek';
 $strDataOnly = 'Alleen data';
-$strDatabase = 'Database ';
+$strDatabase = 'Database';
 $strDatabaseEmpty = 'De database naam is leeg!';
 $strDatabaseExportOptions = 'Database export opties';
 $strDatabaseHasBeenDropped = 'Database %s is vervallen.';
@@ -598,7 +598,7 @@ $strSelectNumRows = 'in query';
 $strSelectTables = 'Selecteer tabellen';
 $strSend = 'verzenden';
 $strSent = 'Verzonden';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Server keuze';
 $strServerStatus = 'Runtime Informatie';
 $strServerStatusUptime = 'Deze MySQL server draait inmiddels %s. Hij is gestart op %s.';
diff --git a/lang/english-iso-8859-1.inc.php b/lang/english-iso-8859-1.inc.php
index b39b7eb32..0dfec6742 100644
--- a/lang/english-iso-8859-1.inc.php
+++ b/lang/english-iso-8859-1.inc.php
@@ -171,7 +171,7 @@ $strDanish = 'Danish';
 $strData = 'Data';
 $strDataDict = 'Data Dictionary';
 $strDataOnly = 'Data only';
-$strDatabase = 'Database ';
+$strDatabase = 'Database';
 $strDatabaseEmpty = 'The database name is empty!';
 $strDatabaseExportOptions = 'Database export options';
 $strDatabaseHasBeenDropped = 'Database %s has been dropped.';
@@ -595,7 +595,7 @@ $strSelectNumRows = 'in query';
 $strSelectTables = 'Select Tables';
 $strSend = 'Save as file';
 $strSent = 'Sent';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Server Choice';
 $strServerStatus = 'Runtime Information';
 $strServerStatusUptime = 'This MySQL server has been running for %s. It started up on %s.';
diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php
index 2e14d4705..60b8138da 100644
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -172,7 +172,7 @@ $strDanish = 'Danish';
 $strData = 'Data';
 $strDataDict = 'Data Dictionary';
 $strDataOnly = 'Data only';
-$strDatabase = 'Database ';
+$strDatabase = 'Database';
 $strDatabaseEmpty = 'The database name is empty!';
 $strDatabaseExportOptions = 'Database export options';
 $strDatabaseHasBeenDropped = 'Database %s has been dropped.';
@@ -596,7 +596,7 @@ $strSelectNumRows = 'in query';
 $strSelectTables = 'Select Tables';
 $strSend = 'Save as file';
 $strSent = 'Sent';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Server Choice';
 $strServerStatus = 'Runtime Information';
 $strServerStatusUptime = 'This MySQL server has been running for %s. It started up on %s.';
diff --git a/lang/estonian-iso-8859-1.inc.php b/lang/estonian-iso-8859-1.inc.php
index 0fe47518a..392602b87 100644
--- a/lang/estonian-iso-8859-1.inc.php
+++ b/lang/estonian-iso-8859-1.inc.php
@@ -171,7 +171,7 @@ $strDanish = 'Taani';
 $strData = 'Andmed';
 $strDataDict = 'Andmes�nastik';
 $strDataOnly = 'Ainult andmed';
-$strDatabase = 'Andmebaas ';
+$strDatabase = 'Andmebaas';
 $strDatabaseEmpty = 'Andmebaasi nimi on t�hi!';
 $strDatabaseExportOptions = 'Andmebaasi eksportimise seaded';
 $strDatabaseHasBeenDropped = 'Andmebaas %s kustutatud.';
@@ -595,7 +595,7 @@ $strSelectNumRows = 'p
 $strSelectTables = 'Vali tabelid';
 $strSend = 'Salvesta failina';
 $strSent = 'Saadetud';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Serveri valik';
 $strServerStatus = 'Jooksev informatsioon';
 $strServerStatusUptime = 'See MySQL server on k�inud %s. K�ivitusaeg %s.';
diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php
index 09c1a634a..91df14412 100644
--- a/lang/estonian-utf-8.inc.php
+++ b/lang/estonian-utf-8.inc.php
@@ -172,7 +172,7 @@ $strDanish = 'Taani';
 $strData = 'Andmed';
 $strDataDict = 'Andmesõnastik';
 $strDataOnly = 'Ainult andmed';
-$strDatabase = 'Andmebaas ';
+$strDatabase = 'Andmebaas';
 $strDatabaseEmpty = 'Andmebaasi nimi on tühi!';
 $strDatabaseExportOptions = 'Andmebaasi eksportimise seaded';
 $strDatabaseHasBeenDropped = 'Andmebaas %s kustutatud.';
@@ -596,7 +596,7 @@ $strSelectNumRows = 'päringus';
 $strSelectTables = 'Vali tabelid';
 $strSend = 'Salvesta failina';
 $strSent = 'Saadetud';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Serveri valik';
 $strServerStatus = 'Jooksev informatsioon';
 $strServerStatusUptime = 'See MySQL server on käinud %s. Käivitusaeg %s.';
diff --git a/lang/finnish-iso-8859-1.inc.php b/lang/finnish-iso-8859-1.inc.php
index d489ba044..2613e3692 100644
--- a/lang/finnish-iso-8859-1.inc.php
+++ b/lang/finnish-iso-8859-1.inc.php
@@ -101,7 +101,7 @@ $strCriteria = 'Hakuehdot';
 
 $strData = 'Data';
 $strDataOnly = 'Vain data';
-$strDatabase = 'Tietokanta ';
+$strDatabase = 'Tietokanta';
 $strDatabaseHasBeenDropped = 'Tietokanta %s on pudotettu.';
 $strDatabaseWildcard = 'Tietokanta (voit k�ytt�� jokerimerkkej�):';
 $strDatabases = 'tietokantaa';
@@ -356,7 +356,7 @@ $strSelectFields = 'Valitse sarakkeet (v
 $strSelectNumRows = 'lauseessa';
 $strSelectTables = 'Valitse taulut';
 $strSend = 'Tallenna tiedostoksi';
-$strServer = 'Palvelin %s';
+$strServer = 'Palvelin';
 $strServerChoice = 'Valitse palvelin';
 $strServerTrafficNotes = '<b>Server traffic</b>: These tables show the network traffic statistics of this MySQL server since its startup.';
 $strServerVersion = 'Palvelimen versio';
diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php
index 673282e6a..956676055 100644
--- a/lang/finnish-utf-8.inc.php
+++ b/lang/finnish-utf-8.inc.php
@@ -102,7 +102,7 @@ $strCriteria = 'Hakuehdot';
 
 $strData = 'Data';
 $strDataOnly = 'Vain data';
-$strDatabase = 'Tietokanta ';
+$strDatabase = 'Tietokanta';
 $strDatabaseHasBeenDropped = 'Tietokanta %s on pudotettu.';
 $strDatabaseWildcard = 'Tietokanta (voit käyttää jokerimerkkejä):';
 $strDatabases = 'tietokantaa';
@@ -357,7 +357,7 @@ $strSelectFields = 'Valitse sarakkeet (vähintään yksi):';
 $strSelectNumRows = 'lauseessa';
 $strSelectTables = 'Valitse taulut';
 $strSend = 'Tallenna tiedostoksi';
-$strServer = 'Palvelin %s';
+$strServer = 'Palvelin';
 $strServerChoice = 'Valitse palvelin';
 $strServerTrafficNotes = '<b>Server traffic</b>: These tables show the network traffic statistics of this MySQL server since its startup.';
 $strServerVersion = 'Palvelimen versio';
diff --git a/lang/french-iso-8859-1.inc.php b/lang/french-iso-8859-1.inc.php
index a7ccaea8f..26af4fd26 100644
--- a/lang/french-iso-8859-1.inc.php
+++ b/lang/french-iso-8859-1.inc.php
@@ -596,7 +596,7 @@ $strSelectNumRows = 'dans la requ
 $strSelectTables = 'Choisissez les tables';
 $strSend = 'Transmettre';
 $strSent = 'Envoy�';
-$strServer = 'Serveur %s';
+$strServer = 'Serveur';
 $strServerChoice = 'Choix du serveur';
 $strServerStatus = 'Informations sur le serveur';
 $strServerStatusUptime = 'Ce serveur MySQL fonctionne depuis %s. Il a d�marr� le %s.';
diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php
index 639fe87ba..6dc130ce1 100644
--- a/lang/french-utf-8.inc.php
+++ b/lang/french-utf-8.inc.php
@@ -597,7 +597,7 @@ $strSelectNumRows = 'dans la requête';
 $strSelectTables = 'Choisissez les tables';
 $strSend = 'Transmettre';
 $strSent = 'Envoyé';
-$strServer = 'Serveur %s';
+$strServer = 'Serveur';
 $strServerChoice = 'Choix du serveur';
 $strServerStatus = 'Informations sur le serveur';
 $strServerStatusUptime = 'Ce serveur MySQL fonctionne depuis %s. Il a démarré le %s.';
diff --git a/lang/galician-iso-8859-1.inc.php b/lang/galician-iso-8859-1.inc.php
index 1579b6054..9da34caef 100644
--- a/lang/galician-iso-8859-1.inc.php
+++ b/lang/galician-iso-8859-1.inc.php
@@ -161,7 +161,7 @@ $strDanish = 'Dinamarqués';
 $strData = 'Datos';
 $strDataDict = 'Diccionario de datos';
 $strDataOnly = 'S� os datos';
-$strDatabase = 'Banco de Datos ';
+$strDatabase = 'Banco de Datos';
 $strDatabaseExportOptions = 'Opci�ns de exportaci�n da base de datos';
 $strDatabaseHasBeenDropped = 'A base de datos %s foi eliminada.';
 $strDatabaseNoTable = 'Esta base de datos non cont�n nengunha tabela';
@@ -556,7 +556,7 @@ $strSelectNumRows = 'a procurar';
 $strSelectTables = 'Seleccionar tabelas';
 $strSend = 'Enviar <i>(gravar nun ficheiro)</i><br />';
 $strSent = 'Enviado';
-$strServer = 'Servidor %s';
+$strServer = 'Servidor';
 $strServerChoice = 'Escolla de Servidor';
 $strServerStatus = 'Informaci�n sobre o runtime';
 $strServerStatusUptime = 'Este servidor de MySQL leva funcionando %s. Iniciouse �s %s.';
diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php
index 1ebf204fe..5786fd949 100644
--- a/lang/galician-utf-8.inc.php
+++ b/lang/galician-utf-8.inc.php
@@ -162,7 +162,7 @@ $strDanish = 'Dinamarqués';
 $strData = 'Datos';
 $strDataDict = 'Diccionario de datos';
 $strDataOnly = 'Só os datos';
-$strDatabase = 'Banco de Datos ';
+$strDatabase = 'Banco de Datos';
 $strDatabaseExportOptions = 'Opcións de exportación da base de datos';
 $strDatabaseHasBeenDropped = 'A base de datos %s foi eliminada.';
 $strDatabaseNoTable = 'Esta base de datos non contén nengunha tabela';
@@ -557,7 +557,7 @@ $strSelectNumRows = 'a procurar';
 $strSelectTables = 'Seleccionar tabelas';
 $strSend = 'Enviar <i>(gravar nun ficheiro)</i><br />';
 $strSent = 'Enviado';
-$strServer = 'Servidor %s';
+$strServer = 'Servidor';
 $strServerChoice = 'Escolla de Servidor';
 $strServerStatus = 'Información sobre o runtime';
 $strServerStatusUptime = 'Este servidor de MySQL leva funcionando %s. Iniciouse às %s.';
diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php
index 5b22230be..f3c35a0d6 100644
--- a/lang/georgian-utf-8.inc.php
+++ b/lang/georgian-utf-8.inc.php
@@ -99,7 +99,7 @@ $strCreatePage = 'შექმენი ახალი გვერდი';
 $strCriteria = 'კრიტერია';
 
 $strData = 'მონაცემები';
-$strDatabase = 'მონაცემთა ბაზა ';
+$strDatabase = 'მონაცემთა ბაზა';
 $strDatabaseHasBeenDropped = 'მონაცემთა ბაზა %s წაიშალა.';
 $strDatabases = 'ბაზები';
 $strDatabasesStats = 'მონაცემთა ბაზის სტატისტიკა';
@@ -444,7 +444,7 @@ $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
+$strServer = 'Server';  //to translate
 $strPutColNames = 'Put fields names at first row';  //to translate
 $strImportDocSQL = 'Import docSQL Files';  //to translate
 $strDataDict = 'Data Dictionary';  //to translate
diff --git a/lang/german-iso-8859-1.inc.php b/lang/german-iso-8859-1.inc.php
index 2e2d2a452..a1add17c0 100644
--- a/lang/german-iso-8859-1.inc.php
+++ b/lang/german-iso-8859-1.inc.php
@@ -601,7 +601,7 @@ $strSelectNumRows = 'in der Abfrage';
 $strSelectTables = 'Tabellenauswahl';
 $strSend = 'Senden';
 $strSent = 'Gesendet';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Server Ausw�hlen';
 $strServerStatus = 'Laufzeit-Informationen';
 $strServerStatusUptime = 'Dieser MySQL-Server l�uft bereits %s. Er wurde am %s gestartet.';
diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php
index 69d438eed..c0b5a4199 100644
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -602,7 +602,7 @@ $strSelectNumRows = 'in der Abfrage';
 $strSelectTables = 'Tabellenauswahl';
 $strSend = 'Senden';
 $strSent = 'Gesendet';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Server Auswählen';
 $strServerStatus = 'Laufzeit-Informationen';
 $strServerStatusUptime = 'Dieser MySQL-Server läuft bereits %s. Er wurde am %s gestartet.';
diff --git a/lang/greek-iso-8859-7.inc.php b/lang/greek-iso-8859-7.inc.php
index 425c978c6..2f19c9ea3 100644
--- a/lang/greek-iso-8859-7.inc.php
+++ b/lang/greek-iso-8859-7.inc.php
@@ -156,7 +156,7 @@ $strDanish = '
 $strData = '��������';
 $strDataDict = '������ ���������';  
 $strDataOnly = '���� �� ��������';
-$strDatabase = '���� ';
+$strDatabase = '����';
 $strDatabaseExportOptions = '�������� �������� ����� ���������';
 $strDatabaseHasBeenDropped = '� ���� ��������� %s ��������.';
 $strDatabaseNoTable = '���� � ���� ��� �������� �������!';
@@ -551,7 +551,7 @@ $strSelectNumRows = '
 $strSelectTables = '������� �������';  
 $strSend = '��������';
 $strSent = '���������'; 
-$strServer = '����������� %s';  
+$strServer = '�����������';  
 $strServerChoice = '������� ����������';
 $strServerStatus = '����������� ���������'; 
 $strServerStatusUptime = '����� � ����������� MySQL ���������� ��� %s. �������� ���� %s.'; 
diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php
index a3e0ae46c..dd64f0d44 100644
--- a/lang/greek-utf-8.inc.php
+++ b/lang/greek-utf-8.inc.php
@@ -157,7 +157,7 @@ $strDanish = 'Δανικά';
 $strData = 'Δεδομένα';
 $strDataDict = 'Λεξικό δεδομένων';
 $strDataOnly = 'Μόνο τα δεδομένα';
-$strDatabase = 'Βάση ';
+$strDatabase = 'Βάση';
 $strDatabaseExportOptions = 'Επιλογές εξαγωγής βάσης δεδομένων';
 $strDatabaseHasBeenDropped = 'Η βάση δεδομένων %s διεγράφη.';
 $strDatabaseNoTable = 'Αυτή η βάση δεν περιέχει πίνακες!';
@@ -552,7 +552,7 @@ $strSelectNumRows = 'στην εντολή';
 $strSelectTables = 'Επιλογή Πινάκων';
 $strSend = 'Αποστολή';
 $strSent = 'Εστάλησαν';
-$strServer = 'Διακομιστής %s';
+$strServer = 'Διακομιστής';
 $strServerChoice = 'Επιλογή Διακομιστή';
 $strServerStatus = 'Πληροφορίες εκτέλεσης';
 $strServerStatusUptime = 'Αυτός ο διακομιστής MySQL λειτουργεί για %s. Ξεκίνησε στις %s.';
diff --git a/lang/hebrew-iso-8859-8-i.inc.php b/lang/hebrew-iso-8859-8-i.inc.php
index 6a72503f3..63cc0ea97 100644
--- a/lang/hebrew-iso-8859-8-i.inc.php
+++ b/lang/hebrew-iso-8859-8-i.inc.php
@@ -109,7 +109,7 @@ $strDBGModule = '
 $strData = '����';
 $strDataDict = '����� ����';
 $strDataOnly = '���� ����';
-$strDatabase = '��� ������ ';
+$strDatabase = '��� ������';
 $strDatabaseHasBeenDropped = '��� ������� %s ����.';
 $strDatabaseWildcard = '��� ������ (����� ������ ������):';
 $strDatabases = '���� �������';
@@ -379,7 +379,7 @@ $strSelectNumRows = '
 $strSelectTables = '��� ������';
 $strSend = '���� �����';
 $strSent = '����';
-$strServer = '��� %s';
+$strServer = '���';
 $strServerChoice = '����� ���';
 $strServerTabProcesslist = '�������';
 $strServerTabVariables = '������';
diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php
index b0f7da930..98eca7d91 100644
--- a/lang/hindi-utf-8.inc.php
+++ b/lang/hindi-utf-8.inc.php
@@ -658,7 +658,7 @@ $strSecretRequired = 'The configuration file now needs a secret passphrase (blow
 $strSelectFields = 'Select fields (at least one):'; //to translate
 $strSelectNumRows = 'in query'; //to translate
 $strSent = 'Sent'; //to translate
-$strServer = 'Server %s';  //to translate
+$strServer = 'Server';  //to translate
 $strServerStatus = 'Runtime Information'; //to translate
 $strServerStatusUptime = 'This MySQL server has been running for %s. It started up on %s.'; //to translate
 $strServerTabProcesslist = 'Processes'; //to translate
diff --git a/lang/hungarian-iso-8859-2.inc.php b/lang/hungarian-iso-8859-2.inc.php
index c2be82982..27e5f63fb 100644
--- a/lang/hungarian-iso-8859-2.inc.php
+++ b/lang/hungarian-iso-8859-2.inc.php
@@ -98,7 +98,7 @@ $strCreatePdfFeat = 'PDF k
 $strCriteria = 'Krit�rium';
 
 $strData = 'Adat';
-$strDatabase = 'Adatb�zis ';
+$strDatabase = 'Adatb�zis';
 $strDatabaseHasBeenDropped = '%s adatb�zist eldobtam.';
 $strDatabases = 'adatb�zisok';
 $strDatabasesStats = 'Adatb�zis statisztika';
@@ -430,7 +430,7 @@ $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
+$strServer = 'Server';  //to translate
 $strPutColNames = 'Put fields names at first row';  //to translate
 $strImportDocSQL = 'Import docSQL Files';  //to translate
 $strDataDict = 'Data Dictionary';  //to translate
diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php
index 608a491b6..1020f336a 100644
--- a/lang/hungarian-utf-8.inc.php
+++ b/lang/hungarian-utf-8.inc.php
@@ -99,7 +99,7 @@ $strCreatePdfFeat = 'PDF készítése';
 $strCriteria = 'Kritérium';
 
 $strData = 'Adat';
-$strDatabase = 'Adatbázis ';
+$strDatabase = 'Adatbázis';
 $strDatabaseHasBeenDropped = '%s adatbázist eldobtam.';
 $strDatabases = 'adatbázisok';
 $strDatabasesStats = 'Adatbázis statisztika';
@@ -431,7 +431,7 @@ $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
+$strServer = 'Server';  //to translate
 $strPutColNames = 'Put fields names at first row';  //to translate
 $strImportDocSQL = 'Import docSQL Files';  //to translate
 $strDataDict = 'Data Dictionary';  //to translate
diff --git a/lang/indonesian-iso-8859-1.inc.php b/lang/indonesian-iso-8859-1.inc.php
index b2d65dadc..47fdf4b18 100644
--- a/lang/indonesian-iso-8859-1.inc.php
+++ b/lang/indonesian-iso-8859-1.inc.php
@@ -171,7 +171,7 @@ $strDanish = 'Bahasa Denmark';
 $strData = 'Data';
 $strDataDict = 'Kamus Data';
 $strDataOnly = 'Data saja';
-$strDatabase = 'Database ';
+$strDatabase = 'Database';
 $strDatabaseEmpty = 'Nama database kosong!';
 $strDatabaseExportOptions = 'Pilihan cara untuk mengekspor Database';
 $strDatabaseHasBeenDropped = 'Database %s telah dihapus.';
@@ -595,7 +595,7 @@ $strSelectNumRows = 'dalam susunan pemeriksaan';
 $strSelectTables = 'Pilih tabel';
 $strSend = 'Kirimkan ke';
 $strSent = 'Dikirim';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Pilihan Server';
 $strServerStatus = 'Informasi Runtime';
 $strServerStatusUptime = 'MySQL server ini telah berjalan secara berturut-turut selama %s. Server dijalankan pada %s.';
diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php
index a3c228495..61253a646 100644
--- a/lang/indonesian-utf-8.inc.php
+++ b/lang/indonesian-utf-8.inc.php
@@ -172,7 +172,7 @@ $strDanish = 'Bahasa Denmark';
 $strData = 'Data';
 $strDataDict = 'Kamus Data';
 $strDataOnly = 'Data saja';
-$strDatabase = 'Database ';
+$strDatabase = 'Database';
 $strDatabaseEmpty = 'Nama database kosong!';
 $strDatabaseExportOptions = 'Pilihan cara untuk mengekspor Database';
 $strDatabaseHasBeenDropped = 'Database %s telah dihapus.';
@@ -596,7 +596,7 @@ $strSelectNumRows = 'dalam susunan pemeriksaan';
 $strSelectTables = 'Pilih tabel';
 $strSend = 'Kirimkan ke';
 $strSent = 'Dikirim';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Pilihan Server';
 $strServerStatus = 'Informasi Runtime';
 $strServerStatusUptime = 'MySQL server ini telah berjalan secara berturut-turut selama %s. Server dijalankan pada %s.';
diff --git a/lang/italian-iso-8859-1.inc.php b/lang/italian-iso-8859-1.inc.php
index 119b8ce5f..4f64f6112 100644
--- a/lang/italian-iso-8859-1.inc.php
+++ b/lang/italian-iso-8859-1.inc.php
@@ -170,7 +170,7 @@ $strDanish = 'Danese';
 $strData = 'Dati';
 $strDataDict = 'Data Dictionary';
 $strDataOnly = 'Solo dati';
-$strDatabase = 'Database ';
+$strDatabase = 'Database';
 $strDatabaseExportOptions = 'Opzioni di esportazione del database';
 $strDatabaseHasBeenDropped = 'Il Database %s � stato eliminato.';
 $strDatabaseNoTable = 'Questo database non contiene tabelle!';
@@ -581,7 +581,7 @@ $strSelectNumRows = 'nella query';
 $strSelectTables = 'Seleziona Tables';
 $strSend = 'Salva con nome...';
 $strSent = 'Spediti';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Scelta del server';
 $strServerStatus = 'Informazioni di Runtime';
 $strServerStatusUptime = 'Questo server MySQL sta girando da %s. E\' stato avviato il %s.';
diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php
index 3d4e25198..434e6e973 100644
--- a/lang/italian-utf-8.inc.php
+++ b/lang/italian-utf-8.inc.php
@@ -171,7 +171,7 @@ $strDanish = 'Danese';
 $strData = 'Dati';
 $strDataDict = 'Data Dictionary';
 $strDataOnly = 'Solo dati';
-$strDatabase = 'Database ';
+$strDatabase = 'Database';
 $strDatabaseExportOptions = 'Opzioni di esportazione del database';
 $strDatabaseHasBeenDropped = 'Il Database %s è stato eliminato.';
 $strDatabaseNoTable = 'Questo database non contiene tabelle!';
@@ -582,7 +582,7 @@ $strSelectNumRows = 'nella query';
 $strSelectTables = 'Seleziona Tables';
 $strSend = 'Salva con nome...';
 $strSent = 'Spediti';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Scelta del server';
 $strServerStatus = 'Informazioni di Runtime';
 $strServerStatusUptime = 'Questo server MySQL sta girando da %s. E\' stato avviato il %s.';
diff --git a/lang/japanese-euc.inc.php b/lang/japanese-euc.inc.php
index eec8baff4..13e848b59 100644
--- a/lang/japanese-euc.inc.php
+++ b/lang/japanese-euc.inc.php
@@ -462,7 +462,7 @@ $strSelectNumRows = '
 $strSelectTables = '�ơ��֥������';
 $strSend = '�ե��������Ȥ�';
 $strSent = '����';
-$strServer = '������ %s';
+$strServer = '������';
 $strServerChoice = '������������';
 $strServerStatus = '��󥿥������';
 $strServerStatusUptime = '����MySQL�����С��� %s �ˤ�ư���档  %s���鳫�Ϥ��Ƥޤ���';
diff --git a/lang/japanese-sjis.inc.php b/lang/japanese-sjis.inc.php
index c608abce1..63edeae45 100644
--- a/lang/japanese-sjis.inc.php
+++ b/lang/japanese-sjis.inc.php
@@ -462,7 +462,7 @@ $strSelectNumRows = '
 $strSelectTables = '�e�[�u���̑I��';
 $strSend = '�t�@�C���ɗ��Ƃ�';
 $strSent = '���M';
-$strServer = '�T�[�o�[ %s';
+$strServer = '�T�[�o�[';
 $strServerChoice = '�T�[�o�[�̑I��';
 $strServerStatus = '�����^�C�����';
 $strServerStatusUptime = '����MySQL�T�[�o�[�� %s �ɂē��쒆�B  %s����J�n���Ă܂��B';
diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php
index b87d0a16d..c12a74555 100644
--- a/lang/japanese-utf-8.inc.php
+++ b/lang/japanese-utf-8.inc.php
@@ -463,7 +463,7 @@ $strSelectNumRows = 'クエリー';
 $strSelectTables = 'テーブルの選択';
 $strSend = 'ファイルに落とす';
 $strSent = '送信';
-$strServer = 'サーバー %s';
+$strServer = 'サーバー';
 $strServerChoice = 'サーバーの選択';
 $strServerStatus = 'ランタイム情報';
 $strServerStatusUptime = 'このMySQLサーバーは %s にて動作中。  %sから開始してます。';
diff --git a/lang/korean-euc-kr.inc.php b/lang/korean-euc-kr.inc.php
index adadfe8ef..e5771ae41 100644
--- a/lang/korean-euc-kr.inc.php
+++ b/lang/korean-euc-kr.inc.php
@@ -103,7 +103,7 @@ $strDBGModule = '
 $strData = '������';
 $strDataDict = '������ ���� (��ü ��������)';
 $strDataOnly = '�����͸�';
-$strDatabase = '�����ͺ��̽� ';
+$strDatabase = '�����ͺ��̽�';
 $strDatabaseHasBeenDropped = '�����ͺ��̽� %s �� �����߽��ϴ�.';
 $strDatabaseWildcard = '�����ͺ��̽� (���ϵ�ī�幮�� ��� ����):';
 $strDatabases = '�����ͺ��̽� ';
@@ -399,7 +399,7 @@ $strSelectFields = '
 $strSelectNumRows = '����(in query)';
 $strSend = '���Ϸ� ����';
 $strSent = '����';
-$strServer = '���� %s';
+$strServer = '����';
 $strServerChoice = '���� ����';
 $strServerStatus = '��Ÿ�� ����';
 $strServerStatusUptime = '�� MySQL ������ %s ���� �����Ǿ����ϴ�. <br/>���� ���۳�¥�� %s �Դϴ�.';
diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php
index a676041b7..c92382220 100644
--- a/lang/korean-utf-8.inc.php
+++ b/lang/korean-utf-8.inc.php
@@ -104,7 +104,7 @@ $strDBGModule = '모듈';
 $strData = '데이터';
 $strDataDict = '데이터 사전 (전체 구조보기)';
 $strDataOnly = '데이터만';
-$strDatabase = '데이터베이스 ';
+$strDatabase = '데이터베이스';
 $strDatabaseHasBeenDropped = '데이터베이스 %s 를 제거했습니다.';
 $strDatabaseWildcard = '데이터베이스 (와일드카드문자 사용 가능):';
 $strDatabases = '데이터베이스 ';
@@ -400,7 +400,7 @@ $strSelectFields = '필드 선택 (하나 이상):';
 $strSelectNumRows = '질의(in query)';
 $strSend = '파일로 저장';
 $strSent = '보냄';
-$strServer = '서버 %s';
+$strServer = '서버';
 $strServerChoice = '서버 선택';
 $strServerStatus = '런타임 정보';
 $strServerStatusUptime = '이 MySQL 서버는 %s 동안 구동되었습니다. <br/>구동 시작날짜는 %s 입니다.';
diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php
index 58da25585..4de8ab244 100644
--- a/lang/latvian-utf-8.inc.php
+++ b/lang/latvian-utf-8.inc.php
@@ -169,7 +169,7 @@ $strDanish = 'Dāņu';
 $strData = 'Dati';
 $strDataDict = 'Datu vārdnīca';
 $strDataOnly = 'Tikai dati';
-$strDatabase = 'Datubāze ';
+$strDatabase = 'Datubāze';
 $strDatabaseExportOptions = 'Datubāzu eksporta opcijas';
 $strDatabaseHasBeenDropped = 'Datubāze %s tika izdzēsta.';
 $strDatabaseNoTable = 'Šajā datubāzē nav tabulu!';
@@ -578,7 +578,7 @@ $strSelectNumRows = 'vaicājumā';
 $strSelectTables = 'Izvēlieties tabulas';
 $strSend = 'Saglabāt kā failu';
 $strSent = 'Nosūtīts';
-$strServer = 'Serveris %s';
+$strServer = 'Serveris';
 $strServerChoice = 'Servera izvēle';
 $strServerStatus = 'Izpildes laika informācija';
 $strServerStatusUptime = 'Šis MySQL serveris strādā %s. Tas tika palaists %s.';
diff --git a/lang/latvian-windows-1257.inc.php b/lang/latvian-windows-1257.inc.php
index 910e08d5d..57a00c443 100644
--- a/lang/latvian-windows-1257.inc.php
+++ b/lang/latvian-windows-1257.inc.php
@@ -168,7 +168,7 @@ $strDanish = 'D
 $strData = 'Dati';
 $strDataDict = 'Datu v�rdn�ca';
 $strDataOnly = 'Tikai dati';
-$strDatabase = 'Datub�ze ';
+$strDatabase = 'Datub�ze';
 $strDatabaseExportOptions = 'Datub�zu eksporta opcijas';
 $strDatabaseHasBeenDropped = 'Datub�ze %s tika izdz�sta.';
 $strDatabaseNoTable = '�aj� datub�z� nav tabulu!';
@@ -577,7 +577,7 @@ $strSelectNumRows = 'vaic
 $strSelectTables = 'Izv�lieties tabulas';
 $strSend = 'Saglab�t k� failu';
 $strSent = 'Nos�t�ts';
-$strServer = 'Serveris %s';
+$strServer = 'Serveris';
 $strServerChoice = 'Servera izv�le';
 $strServerStatus = 'Izpildes laika inform�cija';
 $strServerStatusUptime = '�is MySQL serveris str�d� %s. Tas tika palaists %s.';
diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php
index 540404344..d0da3bc7a 100644
--- a/lang/lithuanian-utf-8.inc.php
+++ b/lang/lithuanian-utf-8.inc.php
@@ -171,7 +171,7 @@ $strDanish = 'Danų';
 $strData = 'Duomenys';
 $strDataDict = 'Duomenų žodynas';
 $strDataOnly = 'Tik duomenys';
-$strDatabase = 'Duombazė ';
+$strDatabase = 'Duombazė';
 $strDatabaseEmpty = 'Nenurodytas duombazės vardas!';
 $strDatabaseExportOptions = 'Duombazės eksportavimo parinktys';
 $strDatabaseHasBeenDropped = 'Duombazė %s ištrinta.';
@@ -589,7 +589,7 @@ $strSelectNumRows = 'užklausą vykdoma';
 $strSelectTables = 'Pasirinkite lenteles';
 $strSend = 'Išsaugoti į failą';
 $strSent = 'Siųsta';
-$strServer = 'Serveris %s';
+$strServer = 'Serveris';
 $strServerChoice = 'Pasirinkti serverį';
 $strServerStatus = 'Veikimo informacija';
 $strServerStatusUptime = 'MySQL serverio veikimo trukmė: %s. Serveris pradėjo veikti: %s.';
diff --git a/lang/lithuanian-windows-1257.inc.php b/lang/lithuanian-windows-1257.inc.php
index 3cc631a75..29ba94b55 100644
--- a/lang/lithuanian-windows-1257.inc.php
+++ b/lang/lithuanian-windows-1257.inc.php
@@ -170,7 +170,7 @@ $strDanish = 'Dan
 $strData = 'Duomenys';
 $strDataDict = 'Duomen� �odynas';
 $strDataOnly = 'Tik duomenys';
-$strDatabase = 'Duombaz� ';
+$strDatabase = 'Duombaz�';
 $strDatabaseEmpty = 'Nenurodytas duombaz�s vardas!';
 $strDatabaseExportOptions = 'Duombaz�s eksportavimo parinktys';
 $strDatabaseHasBeenDropped = 'Duombaz� %s i�trinta.';
@@ -588,7 +588,7 @@ $strSelectNumRows = 'u
 $strSelectTables = 'Pasirinkite lenteles';
 $strSend = 'I�saugoti � fail�';
 $strSent = 'Si�sta';
-$strServer = 'Serveris %s';
+$strServer = 'Serveris';
 $strServerChoice = 'Pasirinkti server�';
 $strServerStatus = 'Veikimo informacija';
 $strServerStatusUptime = 'MySQL serverio veikimo trukm�: %s. Serveris prad�jo veikti: %s.';
diff --git a/lang/malay-iso-8859-1.inc.php b/lang/malay-iso-8859-1.inc.php
index b11d40dec..c081e4550 100644
--- a/lang/malay-iso-8859-1.inc.php
+++ b/lang/malay-iso-8859-1.inc.php
@@ -126,7 +126,7 @@ $strCriteria = 'Kriteria';
 $strData = 'Data';
 $strDataDict = 'Kamus Data';
 $strDataOnly = 'Data sahaja';
-$strDatabase = 'Pangkalan Data ';
+$strDatabase = 'Pangkalan Data';
 $strDatabaseHasBeenDropped = 'angkalan data %s telah digugurkan.';
 $strDatabaseWildcard = 'Pangkalan data (wildcard diizinkan):';
 $strDatabases = 'pangkalan data';
@@ -395,7 +395,7 @@ $strSelectNumRows = 'pada kueri';
 $strSelectTables = 'Pilih Jadual';
 $strSend = 'Simpan sebagai fail';
 $strSent = 'Hantar';
-$strServer = 'Pelayan %s';
+$strServer = 'Pelayan';
 $strServerChoice = 'Pilihan Pelayan';
 $strServerStatus = 'Informasi MasaJana';
 $strServerStatusUptime = 'Pelayan MySQL ini telah berjalan selama %s. Ia dihidupkan pada %s.';
diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php
index b85d27509..033142751 100644
--- a/lang/malay-utf-8.inc.php
+++ b/lang/malay-utf-8.inc.php
@@ -127,7 +127,7 @@ $strCriteria = 'Kriteria';
 $strData = 'Data';
 $strDataDict = 'Kamus Data';
 $strDataOnly = 'Data sahaja';
-$strDatabase = 'Pangkalan Data ';
+$strDatabase = 'Pangkalan Data';
 $strDatabaseHasBeenDropped = 'angkalan data %s telah digugurkan.';
 $strDatabaseWildcard = 'Pangkalan data (wildcard diizinkan):';
 $strDatabases = 'pangkalan data';
@@ -396,7 +396,7 @@ $strSelectNumRows = 'pada kueri';
 $strSelectTables = 'Pilih Jadual';
 $strSend = 'Simpan sebagai fail';
 $strSent = 'Hantar';
-$strServer = 'Pelayan %s';
+$strServer = 'Pelayan';
 $strServerChoice = 'Pilihan Pelayan';
 $strServerStatus = 'Informasi MasaJana';
 $strServerStatusUptime = 'Pelayan MySQL ini telah berjalan selama %s. Ia dihidupkan pada %s.';
diff --git a/lang/norwegian-iso-8859-1.inc.php b/lang/norwegian-iso-8859-1.inc.php
index 8cadb7f05..e86387ef7 100644
--- a/lang/norwegian-iso-8859-1.inc.php
+++ b/lang/norwegian-iso-8859-1.inc.php
@@ -176,7 +176,7 @@ $strDanish = 'dansk';
 $strData = 'Data';
 $strDataDict = 'Dataordbok';
 $strDataOnly = 'Bare data';
-$strDatabase = 'Database ';
+$strDatabase = 'Database';
 $strDatabaseEmpty = 'Databasens navn er tomt!';
 $strDatabaseExportOptions = 'Databaseeksportinnstillinger';
 $strDatabaseHasBeenDropped = 'Databasen %s har blitt slettet';
@@ -600,7 +600,7 @@ $strSelectNumRows = 'i sp
 $strSelectTables = 'Velg tabeller';
 $strSend = 'Last ned som fil';
 $strSent = 'Sendt';
-$strServer = 'Tjener %s';
+$strServer = 'Tjener';
 $strServerChoice = 'Tjenervalg';
 $strServerStatus = 'Kj�ringsinformasjon';
 $strServerStatusUptime = 'Denne MySQL tjeneren har kj�rt i %s. Den startet opp den %s.';
diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php
index f7bcc9741..7cf42847c 100644
--- a/lang/norwegian-utf-8.inc.php
+++ b/lang/norwegian-utf-8.inc.php
@@ -177,7 +177,7 @@ $strDanish = 'dansk';
 $strData = 'Data';
 $strDataDict = 'Dataordbok';
 $strDataOnly = 'Bare data';
-$strDatabase = 'Database ';
+$strDatabase = 'Database';
 $strDatabaseEmpty = 'Databasens navn er tomt!';
 $strDatabaseExportOptions = 'Databaseeksportinnstillinger';
 $strDatabaseHasBeenDropped = 'Databasen %s har blitt slettet';
@@ -601,7 +601,7 @@ $strSelectNumRows = 'i spørring';
 $strSelectTables = 'Velg tabeller';
 $strSend = 'Last ned som fil';
 $strSent = 'Sendt';
-$strServer = 'Tjener %s';
+$strServer = 'Tjener';
 $strServerChoice = 'Tjenervalg';
 $strServerStatus = 'Kjøringsinformasjon';
 $strServerStatusUptime = 'Denne MySQL tjeneren har kjørt i %s. Den startet opp den %s.';
diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php
index 5fc4a86f0..09ffa81af 100644
--- a/lang/persian-utf-8.inc.php
+++ b/lang/persian-utf-8.inc.php
@@ -96,7 +96,7 @@ $strCriteria = 'معيارها';
 $strData = 'داده';
 $strDataDict = 'فرهنگ داده‌ها';
 $strDataOnly = 'فقط داده‌ها';
-$strDatabase = 'پايگاه داده ';
+$strDatabase = 'پايگاه داده';
 $strDatabaseHasBeenDropped = 'پايگاه داده %s حذف گرديد.';
 $strDatabaseWildcard = 'پايگاه‌داده (wildcards allowed):';
 $strDatabases = 'پايگاههاي داده';
@@ -325,7 +325,7 @@ $strSelectFields = 'ستونها را انتخاب نماييد (حداقل يك
 $strSelectNumRows = 'in query';
 $strSelectTables = 'Select Tables';
 $strSend = 'ذخيره به صورت پرونده';
-$strServer = 'سرور %s';
+$strServer = 'سرور';
 $strServerVersion = 'نسخه سرور';
 $strSetEnumVal = 'اگر نوع ستون "enum" يا "set" مي‌باشد ، لطفا براي ورود مقادير از اين قالب استفاده نماييد : \'a\',\'b\',\'c\'...<br /> اگر احتياج داشتيد كه از علامت مميز برعكس(بك‌اسلش) (" \ ") يا نقل‌قول تكي (" \' ") در آن مقادير استفاده نماييد ، قبل از آنها علامت (" \ ") را بگذاريد<br /> (براي مثال\'\\\\xyz\' يا \'a\\\'b\')';
 $strShow = 'نمايش';
diff --git a/lang/persian-windows-1256.inc.php b/lang/persian-windows-1256.inc.php
index 336eb2c0b..aeab7d237 100644
--- a/lang/persian-windows-1256.inc.php
+++ b/lang/persian-windows-1256.inc.php
@@ -95,7 +95,7 @@ $strCriteria = '
 $strData = '����';
 $strDataDict = '���� ������';
 $strDataOnly = '��� ������';
-$strDatabase = '����� ���� ';
+$strDatabase = '����� ����';
 $strDatabaseHasBeenDropped = '����� ���� %s ��� �����.';
 $strDatabaseWildcard = '��������� (wildcards allowed):';
 $strDatabases = '�������� ����';
@@ -324,7 +324,7 @@ $strSelectFields = '
 $strSelectNumRows = 'in query';
 $strSelectTables = 'Select Tables';
 $strSend = '����� �� ���� ������';
-$strServer = '���� %s';
+$strServer = '����';
 $strServerVersion = '���� ����';
 $strSetEnumVal = 'ǐ� ��� ���� "enum" �� "set" ������ � ���� ���� ���� ������ �� ��� ���� ������� ������ : \'a\',\'b\',\'c\'...<br /> ǐ� ������ ������ �� �� ����� ���� �����(�ߝ����) (" \ ") �� ������ ��� (" \' ") �� �� ������ ������� ������ � ��� �� ���� ����� (" \ ") �� Ȑ�����<br /> (���� ����\'\\\\xyz\' �� \'a\\\'b\')';
 $strShow = '�����';
diff --git a/lang/polish-iso-8859-2.inc.php b/lang/polish-iso-8859-2.inc.php
index 75e5de211..480e087d2 100644
--- a/lang/polish-iso-8859-2.inc.php
+++ b/lang/polish-iso-8859-2.inc.php
@@ -165,7 +165,7 @@ $strDanish = 'Du
 $strData = 'Dane';
 $strDataDict = 'S�ownik danych';
 $strDataOnly = 'Tylko dane';
-$strDatabase = 'Baza danych ';
+$strDatabase = 'Baza danych';
 $strDatabaseExportOptions = 'Opcje eksportu bazy danych';
 $strDatabaseHasBeenDropped = 'Baza danych %s zosta�a usuni�ta.';
 $strDatabaseNoTable = 'Ta baza danych nie zawiera �adnej tabeli!';
@@ -577,7 +577,7 @@ $strSelectNumRows = 'w zapytaniu';
 $strSelectTables = 'Wybierz tabele';
 $strSend = 'Zapisz jako plik';
 $strSent = 'Wys�ane';
-$strServer = 'Serwer %s';
+$strServer = 'Serwer';
 $strServerChoice = 'Wyb�r serwera';
 $strServerStatus = 'Informacje o dzia�aniu serwera';
 $strServerStatusUptime = 'Ten serwer MySQL dzia�a przez %s. Rozpocz�cie jego pracy: %s.';
diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php
index d325fdf79..684627e73 100644
--- a/lang/polish-utf-8.inc.php
+++ b/lang/polish-utf-8.inc.php
@@ -166,7 +166,7 @@ $strDanish = 'Duński';
 $strData = 'Dane';
 $strDataDict = 'Słownik danych';
 $strDataOnly = 'Tylko dane';
-$strDatabase = 'Baza danych ';
+$strDatabase = 'Baza danych';
 $strDatabaseExportOptions = 'Opcje eksportu bazy danych';
 $strDatabaseHasBeenDropped = 'Baza danych %s została usunięta.';
 $strDatabaseNoTable = 'Ta baza danych nie zawiera żadnej tabeli!';
@@ -578,7 +578,7 @@ $strSelectNumRows = 'w zapytaniu';
 $strSelectTables = 'Wybierz tabele';
 $strSend = 'Zapisz jako plik';
 $strSent = 'Wysłane';
-$strServer = 'Serwer %s';
+$strServer = 'Serwer';
 $strServerChoice = 'Wybór serwera';
 $strServerStatus = 'Informacje o działaniu serwera';
 $strServerStatusUptime = 'Ten serwer MySQL działa przez %s. Rozpoczęcie jego pracy: %s.';
diff --git a/lang/portuguese-iso-8859-1.inc.php b/lang/portuguese-iso-8859-1.inc.php
index 46a655093..58c209d9a 100644
--- a/lang/portuguese-iso-8859-1.inc.php
+++ b/lang/portuguese-iso-8859-1.inc.php
@@ -161,7 +161,7 @@ $strDanish = 'Dinamarqu
 $strData = 'Dados';
 $strDataDict = 'Dicionario de dados';
 $strDataOnly = 'Apenas dados';
-$strDatabase = 'Base de Dados ';
+$strDatabase = 'Base de Dados';
 $strDatabaseExportOptions = 'Op��es de exporta��o da Base de Dados';
 $strDatabaseHasBeenDropped = 'A base de dados %s foi eliminada.';
 $strDatabaseNoTable = 'Esta Base de Dados n�o cont�m qualquer tabela!';
@@ -559,7 +559,7 @@ $strSelectNumRows = 'na pesquisa';
 $strSelectTables = 'Seleccionar Tabelas';
 $strSend = 'envia';
 $strSent = 'Enviado';
-$strServer = 'Servidor %s';
+$strServer = 'Servidor';
 $strServerChoice = 'Escolha do Servidor';
 $strServerStatus = 'Informa��o de Runtime';
 $strServerStatusUptime = 'Este servidor de mySQL estar a correr h� %s. Foi iniciado em/a %s.';
diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php
index 4a1ec104b..17af67749 100644
--- a/lang/portuguese-utf-8.inc.php
+++ b/lang/portuguese-utf-8.inc.php
@@ -162,7 +162,7 @@ $strDanish = 'Dinamarquês';
 $strData = 'Dados';
 $strDataDict = 'Dicionario de dados';
 $strDataOnly = 'Apenas dados';
-$strDatabase = 'Base de Dados ';
+$strDatabase = 'Base de Dados';
 $strDatabaseExportOptions = 'Opções de exportação da Base de Dados';
 $strDatabaseHasBeenDropped = 'A base de dados %s foi eliminada.';
 $strDatabaseNoTable = 'Esta Base de Dados não contém qualquer tabela!';
@@ -560,7 +560,7 @@ $strSelectNumRows = 'na pesquisa';
 $strSelectTables = 'Seleccionar Tabelas';
 $strSend = 'envia';
 $strSent = 'Enviado';
-$strServer = 'Servidor %s';
+$strServer = 'Servidor';
 $strServerChoice = 'Escolha do Servidor';
 $strServerStatus = 'Informação de Runtime';
 $strServerStatusUptime = 'Este servidor de mySQL estar a correr há %s. Foi iniciado em/a %s.';
diff --git a/lang/romanian-iso-8859-1.inc.php b/lang/romanian-iso-8859-1.inc.php
index 332e6f6a5..094877607 100644
--- a/lang/romanian-iso-8859-1.inc.php
+++ b/lang/romanian-iso-8859-1.inc.php
@@ -171,7 +171,7 @@ $strDanish = 'Danez';
 $strData = 'Date';
 $strDataDict = 'Dictionar de date';
 $strDataOnly = 'Numai date';
-$strDatabase = 'Baza de date ';
+$strDatabase = 'Baza de date';
 $strDatabaseEmpty = 'Campul de denumire a bazei de date este gol!';
 $strDatabaseExportOptions = 'Optiuni de exportare a bazei de date';
 $strDatabaseHasBeenDropped = 'Baza de date %s a fost aruncat.';
@@ -589,7 +589,7 @@ $strSelectNumRows = 'in comanda (in query)';
 $strSelectTables = 'Selecteaza tabele';
 $strSend = 'Trimite';
 $strSent = 'Trimis';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Alegerea serverului';
 $strServerStatus = 'Informatii rulare';
 $strServerStatusUptime = 'Acest server MySQL ruleaza de %s. S-a lansat la %s.';
diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php
index 4198fa5df..1c497fd74 100644
--- a/lang/romanian-utf-8.inc.php
+++ b/lang/romanian-utf-8.inc.php
@@ -172,7 +172,7 @@ $strDanish = 'Danez';
 $strData = 'Date';
 $strDataDict = 'Dictionar de date';
 $strDataOnly = 'Numai date';
-$strDatabase = 'Baza de date ';
+$strDatabase = 'Baza de date';
 $strDatabaseEmpty = 'Campul de denumire a bazei de date este gol!';
 $strDatabaseExportOptions = 'Optiuni de exportare a bazei de date';
 $strDatabaseHasBeenDropped = 'Baza de date %s a fost aruncat.';
@@ -590,7 +590,7 @@ $strSelectNumRows = 'in comanda (in query)';
 $strSelectTables = 'Selecteaza tabele';
 $strSend = 'Trimite';
 $strSent = 'Trimis';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Alegerea serverului';
 $strServerStatus = 'Informatii rulare';
 $strServerStatusUptime = 'Acest server MySQL ruleaza de %s. S-a lansat la %s.';
diff --git a/lang/russian-cp-866.inc.php b/lang/russian-cp-866.inc.php
index 92f389f00..1d3e3c443 100644
--- a/lang/russian-cp-866.inc.php
+++ b/lang/russian-cp-866.inc.php
@@ -167,7 +167,7 @@ $strDanish = '
 $strData = '�����';
 $strDataDict = '������� ������';
 $strDataOnly = '���쪮 �����';
-$strDatabase = '�� ';
+$strDatabase = '��';
 $strDatabaseExportOptions = '��樨 ��ᯮ�� ��';
 $strDatabaseHasBeenDropped = '���� ������ %s �뫠 㤠����.';
 $strDatabaseNoTable = '�� �� �� ᮤ�ন� ⠡���!';
@@ -573,7 +573,7 @@ $strSelectNumRows = '
 $strSelectTables = '�롥�� ⠡����(�)';
 $strSend = '��᫠��';
 $strSent = '��᫠��';
-$strServer = '��ࢥ� %s';
+$strServer = '��ࢥ�';
 $strServerChoice = '�롮� �ࢥ�';
 $strServerStatus = '������ ���ଠ��';
 $strServerStatusUptime = '��� MySQL �ࢥ� ࠡ�⠥� %s. �� �� ����饭 %s.';
diff --git a/lang/russian-koi8-r.inc.php b/lang/russian-koi8-r.inc.php
index f21953888..4094d51a9 100644
--- a/lang/russian-koi8-r.inc.php
+++ b/lang/russian-koi8-r.inc.php
@@ -167,7 +167,7 @@ $strDanish = '
 $strData = '������';
 $strDataDict = '������� ������';
 $strDataOnly = '������ ������';
-$strDatabase = '�� ';
+$strDatabase = '��';
 $strDatabaseExportOptions = '����� �������� ��';
 $strDatabaseHasBeenDropped = '���� ������ %s ���� �������.';
 $strDatabaseNoTable = '��� �� �� �������� ������!';
@@ -573,7 +573,7 @@ $strSelectNumRows = '
 $strSelectTables = '�������� �������(�)';
 $strSend = '�������';
 $strSent = '�������';
-$strServer = '������ %s';
+$strServer = '������';
 $strServerChoice = '����� �������';
 $strServerStatus = '������� ����������';
 $strServerStatusUptime = '���� MySQL ������ �������� %s. �� ��� ������� %s.';
diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php
index adfdd8170..fad2fe052 100644
--- a/lang/russian-utf-8.inc.php
+++ b/lang/russian-utf-8.inc.php
@@ -168,7 +168,7 @@ $strDanish = 'Датский';
 $strData = 'Данные';
 $strDataDict = 'Словарь данных';
 $strDataOnly = 'Только данные';
-$strDatabase = 'БД ';
+$strDatabase = 'БД';
 $strDatabaseExportOptions = 'Опции экспорта БД';
 $strDatabaseHasBeenDropped = 'База данных %s была удалена.';
 $strDatabaseNoTable = 'Эта БД не содержит таблиц!';
@@ -574,7 +574,7 @@ $strSelectNumRows = 'по запросу';
 $strSelectTables = 'Выберите таблицу(ы)';
 $strSend = 'послать';
 $strSent = 'Послано';
-$strServer = 'Сервер %s';
+$strServer = 'Сервер';
 $strServerChoice = 'Выбор сервера';
 $strServerStatus = 'Текущая информация';
 $strServerStatusUptime = 'Этот MySQL сервер работает %s. Он был запущен %s.';
diff --git a/lang/russian-windows-1251.inc.php b/lang/russian-windows-1251.inc.php
index 214201d59..a57838bca 100644
--- a/lang/russian-windows-1251.inc.php
+++ b/lang/russian-windows-1251.inc.php
@@ -167,7 +167,7 @@ $strDanish = '
 $strData = '������';
 $strDataDict = '������� ������';
 $strDataOnly = '������ ������';
-$strDatabase = '�� ';
+$strDatabase = '��';
 $strDatabaseExportOptions = '����� �������� ��';
 $strDatabaseHasBeenDropped = '���� ������ %s ���� �������.';
 $strDatabaseNoTable = '��� �� �� �������� ������!';
@@ -573,7 +573,7 @@ $strSelectNumRows = '
 $strSelectTables = '�������� �������(�)';
 $strSend = '�������';
 $strSent = '�������';
-$strServer = '������ %s';
+$strServer = '������';
 $strServerChoice = '����� �������';
 $strServerStatus = '������� ����������';
 $strServerStatusUptime = '���� MySQL ������ �������� %s. �� ��� ������� %s.';
diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php
index 4354caf50..deb1903a8 100644
--- a/lang/serbian_cyrillic-utf-8.inc.php
+++ b/lang/serbian_cyrillic-utf-8.inc.php
@@ -598,7 +598,7 @@ $strSelectNumRows = 'у упиту';
 $strSelectTables = 'Изабери табеле';
 $strSend = 'Сачувај као датотеку';
 $strSent = 'Послато';
-$strServer = 'Сервер %s';
+$strServer = 'Сервер';
 $strServerChoice = 'Избор сервера';
 $strServerStatus = 'Информације о току рада';
 $strServerStatusUptime = 'Овај MySQL сервер ради већ %s. Покренут је %s.';
diff --git a/lang/serbian_cyrillic-windows-1251.inc.php b/lang/serbian_cyrillic-windows-1251.inc.php
index 7533ac5ed..addc84b43 100644
--- a/lang/serbian_cyrillic-windows-1251.inc.php
+++ b/lang/serbian_cyrillic-windows-1251.inc.php
@@ -597,7 +597,7 @@ $strSelectNumRows = '
 $strSelectTables = '������� ������';
 $strSend = '������ ��� ��������';
 $strSent = '�������';
-$strServer = '������ %s';
+$strServer = '������';
 $strServerChoice = '����� �������';
 $strServerStatus = '���������� � ���� ����';
 $strServerStatusUptime = '��� MySQL ������ ���� �� %s. �������� �� %s.';
diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php
index f6c00e516..436a82056 100644
--- a/lang/serbian_latin-utf-8.inc.php
+++ b/lang/serbian_latin-utf-8.inc.php
@@ -598,7 +598,7 @@ $strSelectNumRows = 'u upitu';
 $strSelectTables = 'Izaberi tabele';
 $strSend = 'Sačuvaj kao datoteku';
 $strSent = 'Poslato';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Izbor servera';
 $strServerStatus = 'Informacije o toku rada';
 $strServerStatusUptime = 'Ovaj MySQL server radi već %s. Pokrenut je %s.';
diff --git a/lang/serbian_latin-windows-1250.inc.php b/lang/serbian_latin-windows-1250.inc.php
index 1d0d4c45f..89b9c541a 100644
--- a/lang/serbian_latin-windows-1250.inc.php
+++ b/lang/serbian_latin-windows-1250.inc.php
@@ -597,7 +597,7 @@ $strSelectNumRows = 'u upitu';
 $strSelectTables = 'Izaberi tabele';
 $strSend = 'Sa�uvaj kao datoteku';
 $strSent = 'Poslato';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Izbor servera';
 $strServerStatus = 'Informacije o toku rada';
 $strServerStatusUptime = 'Ovaj MySQL server radi ve� %s. Pokrenut je %s.';
diff --git a/lang/slovak-iso-8859-2.inc.php b/lang/slovak-iso-8859-2.inc.php
index 5657b4f34..2f4d51ce1 100644
--- a/lang/slovak-iso-8859-2.inc.php
+++ b/lang/slovak-iso-8859-2.inc.php
@@ -173,7 +173,7 @@ $strDanish = 'D
 $strData = 'D�ta';
 $strDataDict = 'D�tov� slovn�k';
 $strDataOnly = 'Iba d�ta';
-$strDatabase = 'Datab�za ';
+$strDatabase = 'Datab�za';
 $strDatabaseEmpty = 'Meno datab�zy je pr�zdne!';
 $strDatabaseExportOptions = 'Nastavenia exportu datab�z';
 $strDatabaseHasBeenDropped = 'Datab�za %s bola zmazan�.';
@@ -593,7 +593,7 @@ $strSelectNumRows = 'v dotaze';
 $strSelectTables = 'Vybra� Tabu�ky';
 $strSend = 'Po�li';
 $strSent = 'Odoslan�';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Vo�ba serveru';
 $strServerStatus = 'Stav serveru';
 $strServerStatusUptime = 'Tento server be�� %s. Bol spusten� %s.';
diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php
index 2a1064967..c01f9a99d 100644
--- a/lang/slovak-utf-8.inc.php
+++ b/lang/slovak-utf-8.inc.php
@@ -174,7 +174,7 @@ $strDanish = 'Dánsky';
 $strData = 'Dáta';
 $strDataDict = 'Dátový slovník';
 $strDataOnly = 'Iba dáta';
-$strDatabase = 'Databáza ';
+$strDatabase = 'Databáza';
 $strDatabaseEmpty = 'Meno databázy je prázdne!';
 $strDatabaseExportOptions = 'Nastavenia exportu databáz';
 $strDatabaseHasBeenDropped = 'Databáza %s bola zmazaná.';
@@ -594,7 +594,7 @@ $strSelectNumRows = 'v dotaze';
 $strSelectTables = 'Vybrať Tabuľky';
 $strSend = 'Pošli';
 $strSent = 'Odoslané';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Voľba serveru';
 $strServerStatus = 'Stav serveru';
 $strServerStatusUptime = 'Tento server beží %s. Bol spustený %s.';
diff --git a/lang/slovak-windows-1250.inc.php b/lang/slovak-windows-1250.inc.php
index 92336e634..03dad8762 100644
--- a/lang/slovak-windows-1250.inc.php
+++ b/lang/slovak-windows-1250.inc.php
@@ -173,7 +173,7 @@ $strDanish = 'D
 $strData = 'D�ta';
 $strDataDict = 'D�tov� slovn�k';
 $strDataOnly = 'Iba d�ta';
-$strDatabase = 'Datab�za ';
+$strDatabase = 'Datab�za';
 $strDatabaseEmpty = 'Meno datab�zy je pr�zdne!';
 $strDatabaseExportOptions = 'Nastavenia exportu datab�z';
 $strDatabaseHasBeenDropped = 'Datab�za %s bola zmazan�.';
@@ -593,7 +593,7 @@ $strSelectNumRows = 'v dotaze';
 $strSelectTables = 'Vybra� Tabu�ky';
 $strSend = 'Po�li';
 $strSent = 'Odoslan�';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Vo�ba serveru';
 $strServerStatus = 'Stav serveru';
 $strServerStatusUptime = 'Tento server be�� %s. Bol spusten� %s.';
diff --git a/lang/slovenian-iso-8859-2.inc.php b/lang/slovenian-iso-8859-2.inc.php
index 17f428700..969a5291c 100644
--- a/lang/slovenian-iso-8859-2.inc.php
+++ b/lang/slovenian-iso-8859-2.inc.php
@@ -173,7 +173,7 @@ $strDanish = 'Dansko';
 $strData = 'Podatki';
 $strDataDict = 'Podatkovni slovar';
 $strDataOnly = 'Samo podatki';
-$strDatabase = 'Podatkovna baza ';
+$strDatabase = 'Podatkovna baza';
 $strDatabaseEmpty = 'Ime podatkovne baze je prazno!';
 $strDatabaseExportOptions = 'Mo�nosti za izvoz baze podatkov';
 $strDatabaseHasBeenDropped = 'Podatkovna baza %s je zavr�ena.';
@@ -593,7 +593,7 @@ $strSelectNumRows = 'in poizvedba';
 $strSelectTables = 'Izberi tabele';
 $strSend = 'Shrani kot datoteko';
 $strSent = 'Poslano';
-$strServer = 'Stre�nik %s';
+$strServer = 'Stre�nik';
 $strServerChoice = 'Izbira stre�nika';
 $strServerStatus = 'Podatki o izvajanju';
 $strServerStatusUptime = 'MySQL stre�nik deluje �e %s. Zagnal se je %s.';
diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php
index f759a440a..91aabdf65 100644
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -174,7 +174,7 @@ $strDanish = 'Dansko';
 $strData = 'Podatki';
 $strDataDict = 'Podatkovni slovar';
 $strDataOnly = 'Samo podatki';
-$strDatabase = 'Podatkovna baza ';
+$strDatabase = 'Podatkovna baza';
 $strDatabaseEmpty = 'Ime podatkovne baze je prazno!';
 $strDatabaseExportOptions = 'Možnosti za izvoz baze podatkov';
 $strDatabaseHasBeenDropped = 'Podatkovna baza %s je zavržena.';
@@ -594,7 +594,7 @@ $strSelectNumRows = 'in poizvedba';
 $strSelectTables = 'Izberi tabele';
 $strSend = 'Shrani kot datoteko';
 $strSent = 'Poslano';
-$strServer = 'Strežnik %s';
+$strServer = 'Strežnik';
 $strServerChoice = 'Izbira strežnika';
 $strServerStatus = 'Podatki o izvajanju';
 $strServerStatusUptime = 'MySQL strežnik deluje že %s. Zagnal se je %s.';
diff --git a/lang/slovenian-windows-1250.inc.php b/lang/slovenian-windows-1250.inc.php
index 8f99970d0..abc88d73a 100644
--- a/lang/slovenian-windows-1250.inc.php
+++ b/lang/slovenian-windows-1250.inc.php
@@ -173,7 +173,7 @@ $strDanish = 'Dansko';
 $strData = 'Podatki';
 $strDataDict = 'Podatkovni slovar';
 $strDataOnly = 'Samo podatki';
-$strDatabase = 'Podatkovna baza ';
+$strDatabase = 'Podatkovna baza';
 $strDatabaseEmpty = 'Ime podatkovne baze je prazno!';
 $strDatabaseExportOptions = 'Mo�nosti za izvoz baze podatkov';
 $strDatabaseHasBeenDropped = 'Podatkovna baza %s je zavr�ena.';
@@ -593,7 +593,7 @@ $strSelectNumRows = 'in poizvedba';
 $strSelectTables = 'Izberi tabele';
 $strSend = 'Shrani kot datoteko';
 $strSent = 'Poslano';
-$strServer = 'Stre�nik %s';
+$strServer = 'Stre�nik';
 $strServerChoice = 'Izbira stre�nika';
 $strServerStatus = 'Podatki o izvajanju';
 $strServerStatusUptime = 'MySQL stre�nik deluje �e %s. Zagnal se je %s.';
diff --git a/lang/spanish-iso-8859-1.inc.php b/lang/spanish-iso-8859-1.inc.php
index 0119ce239..3c155ce97 100644
--- a/lang/spanish-iso-8859-1.inc.php
+++ b/lang/spanish-iso-8859-1.inc.php
@@ -164,7 +164,7 @@ $strDanish = 'Dan
 $strData = 'Datos';
 $strDataDict = 'Diccionario Datos';
 $strDataOnly = 'Solamente datos';
-$strDatabase = 'Base de datos ';
+$strDatabase = 'Base de datos';
 $strDatabaseExportOptions = 'Opciones de exportaci�n de la base de datos';
 $strDatabaseHasBeenDropped = 'La base de datos %s ha sido eliminada.';
 $strDatabaseNoTable = '�Esta base de datos no contiene tablas!';
@@ -575,7 +575,7 @@ $strSelectNumRows = 'en la consulta';
 $strSelectTables = 'Seleccionar tablas';
 $strSend = 'Enviar (genera un archivo descargable)';
 $strSent = 'Enviado';
-$strServer = 'Servidor %s';
+$strServer = 'Servidor';
 $strServerChoice = 'Elecci�n del servidor';
 $strServerStatus = 'Informaci�n acerca del tiempo de marcha';
 $strServerStatusUptime = 'Este servidor MySQL ha estado corriendo durante %s. Se inici� en %s.';
diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php
index a64014bf3..4f800b0c7 100644
--- a/lang/spanish-utf-8.inc.php
+++ b/lang/spanish-utf-8.inc.php
@@ -165,7 +165,7 @@ $strDanish = 'Danés';
 $strData = 'Datos';
 $strDataDict = 'Diccionario Datos';
 $strDataOnly = 'Solamente datos';
-$strDatabase = 'Base de datos ';
+$strDatabase = 'Base de datos';
 $strDatabaseExportOptions = 'Opciones de exportación de la base de datos';
 $strDatabaseHasBeenDropped = 'La base de datos %s ha sido eliminada.';
 $strDatabaseNoTable = '¡Esta base de datos no contiene tablas!';
@@ -576,7 +576,7 @@ $strSelectNumRows = 'en la consulta';
 $strSelectTables = 'Seleccionar tablas';
 $strSend = 'Enviar (genera un archivo descargable)';
 $strSent = 'Enviado';
-$strServer = 'Servidor %s';
+$strServer = 'Servidor';
 $strServerChoice = 'Elección del servidor';
 $strServerStatus = 'Información acerca del tiempo de marcha';
 $strServerStatusUptime = 'Este servidor MySQL ha estado corriendo durante %s. Se inició en %s.';
diff --git a/lang/swedish-iso-8859-1.inc.php b/lang/swedish-iso-8859-1.inc.php
index 733160059..434e9ce73 100644
--- a/lang/swedish-iso-8859-1.inc.php
+++ b/lang/swedish-iso-8859-1.inc.php
@@ -171,7 +171,7 @@ $strDanish = 'Dansk';
 $strData = 'Data';
 $strDataDict = 'Datalexikon';
 $strDataOnly = 'Enbart data';
-$strDatabase = 'Databas ';
+$strDatabase = 'Databas';
 $strDatabaseEmpty = 'Databasens namn �r tomt!';
 $strDatabaseExportOptions = 'Exportalternativ f�r databas';
 $strDatabaseHasBeenDropped = 'Databasen %s har tagits bort.';
@@ -591,7 +591,7 @@ $strSelectNumRows = 'i fr
 $strSelectTables = 'V�lj tabeller';
 $strSend = 'Spara som fil';
 $strSent = 'Skickade';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Serverval';
 $strServerStatus = 'K�rningsinformation';
 $strServerStatusUptime = 'Denna MySQL-server har k�rts i %s. Den startade den %s.';
diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php
index 984394741..7f250786c 100644
--- a/lang/swedish-utf-8.inc.php
+++ b/lang/swedish-utf-8.inc.php
@@ -172,7 +172,7 @@ $strDanish = 'Dansk';
 $strData = 'Data';
 $strDataDict = 'Datalexikon';
 $strDataOnly = 'Enbart data';
-$strDatabase = 'Databas ';
+$strDatabase = 'Databas';
 $strDatabaseEmpty = 'Databasens namn är tomt!';
 $strDatabaseExportOptions = 'Exportalternativ för databas';
 $strDatabaseHasBeenDropped = 'Databasen %s har tagits bort.';
@@ -592,7 +592,7 @@ $strSelectNumRows = 'i fråga';
 $strSelectTables = 'Välj tabeller';
 $strSend = 'Spara som fil';
 $strSent = 'Skickade';
-$strServer = 'Server %s';
+$strServer = 'Server';
 $strServerChoice = 'Serverval';
 $strServerStatus = 'Körningsinformation';
 $strServerStatusUptime = 'Denna MySQL-server har körts i %s. Den startade den %s.';
diff --git a/lang/thai-tis-620.inc.php b/lang/thai-tis-620.inc.php
index 5a4b25f3c..80caa5d96 100644
--- a/lang/thai-tis-620.inc.php
+++ b/lang/thai-tis-620.inc.php
@@ -140,7 +140,7 @@ $strDBGTotalTimeMs = '
 $strData = '������';
 $strDataDict = '���ҹء��������';
 $strDataOnly = '੾�Т�����';
-$strDatabase = '�ҹ������ ';
+$strDatabase = '�ҹ������';
 $strDatabaseHasBeenDropped = '�¹�ҹ������ %s �������º��������';
 $strDatabaseWildcard = '�ҹ������ (�� wildcards ��):';
 $strDatabases = '�ҹ������';
@@ -488,7 +488,7 @@ $strSelectNumRows = '㹤Ӥ
 $strSelectTables = '���͡���ҧ';
 $strSend = '���������';
 $strSent = '�١��';
-$strServer = '��������� %s';
+$strServer = '���������';
 $strServerChoice = '������͡���������';
 $strServerStatus = '�������ѹ���';
 $strServerStatusUptime = '��������� MySQL ����ѹ�������� %s. ������͹ %s.';
diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php
index 5b9154db1..7d3256552 100644
--- a/lang/thai-utf-8.inc.php
+++ b/lang/thai-utf-8.inc.php
@@ -141,7 +141,7 @@ $strDBGTotalTimeMs = 'เวลาทั้งหมด, มิลลิวิ
 $strData = 'ข้อมูล';
 $strDataDict = 'พจนานุกรมข้อมูล';
 $strDataOnly = 'เฉพาะข้อมูล';
-$strDatabase = 'ฐานข้อมูล ';
+$strDatabase = 'ฐานข้อมูล';
 $strDatabaseHasBeenDropped = 'โยนฐานข้อมูล %s ทิ้งไปเรียบร้อยแล้ว';
 $strDatabaseWildcard = 'ฐานข้อมูล (ใช้ wildcards ได้):';
 $strDatabases = 'ฐานข้อมูล';
@@ -489,7 +489,7 @@ $strSelectNumRows = 'ในคำค้น';
 $strSelectTables = 'เลือกตาราง';
 $strSend = 'ส่งมาเป็นไฟล์';
 $strSent = 'ถูกส่ง';
-$strServer = 'เซิร์ฟเวอร์ %s';
+$strServer = 'เซิร์ฟเวอร์';
 $strServerChoice = 'ตัวเลือกเซิร์ฟเวอร์';
 $strServerStatus = 'ข้อมูลรันไทม์';
 $strServerStatusUptime = 'เซิร์ฟเวอร์ MySQL นี้รันมาเป็นเวลา %s. เริ่มตอน %s.';
diff --git a/lang/turkish-iso-8859-9.inc.php b/lang/turkish-iso-8859-9.inc.php
index 8046a0858..f352968cb 100644
--- a/lang/turkish-iso-8859-9.inc.php
+++ b/lang/turkish-iso-8859-9.inc.php
@@ -175,7 +175,7 @@ $strDanish = 'Danimarkaca';
 $strData = 'Veri';
 $strDataDict = 'Veri s�zl���';
 $strDataOnly = 'Sadece veri';
-$strDatabase = 'Veritaban� ';
+$strDatabase = 'Veritaban�';
 $strDatabaseExportOptions = 'Veritaban� d�n���m ayarlar�';
 $strDatabaseHasBeenDropped = '%s veritaban� kald�r�ld�.';
 $strDatabaseNoTable = 'Bu veritaban� tablo i�ermiyor!';
@@ -584,7 +584,7 @@ $strSelectNumRows = 'sorgu i
 $strSelectTables = 'Tablolar� se�';
 $strSend = 'Dosya olarak kaydet';
 $strSent = 'G�nderildi';
-$strServer = '%s sunucusu';
+$strServer = 'Sunucusu';
 $strServerChoice = 'Server se�imi';
 $strServerStatus = '�al��ma bilgisi'; 
 $strServerStatusUptime = 'Bu MySQL sunucusunun �al��ma s�resi : %s <br /> Ba�lama Zaman�: %s ';
diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php
index db68c49ba..b7833b1d2 100644
--- a/lang/turkish-utf-8.inc.php
+++ b/lang/turkish-utf-8.inc.php
@@ -176,7 +176,7 @@ $strDanish = 'Danimarkaca';
 $strData = 'Veri';
 $strDataDict = 'Veri sözlüğü';
 $strDataOnly = 'Sadece veri';
-$strDatabase = 'Veritabanı ';
+$strDatabase = 'Veritabanı';
 $strDatabaseExportOptions = 'Veritabanı dönüşüm ayarları';
 $strDatabaseHasBeenDropped = '%s veritabanı kaldırıldı.';
 $strDatabaseNoTable = 'Bu veritabanı tablo içermiyor!';
@@ -585,7 +585,7 @@ $strSelectNumRows = 'sorgu içerisinde';
 $strSelectTables = 'Tabloları seç';
 $strSend = 'Dosya olarak kaydet';
 $strSent = 'Gönderildi';
-$strServer = '%s sunucusu';
+$strServer = 'Sunucusu';
 $strServerChoice = 'Server seçimi';
 $strServerStatus = 'Çalışma bilgisi';
 $strServerStatusUptime = 'Bu MySQL sunucusunun çalışma süresi : %s <br /> Başlama Zamanı: %s ';
diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php
index d38274d96..cd2aa63dc 100644
--- a/lang/ukrainian-utf-8.inc.php
+++ b/lang/ukrainian-utf-8.inc.php
@@ -157,7 +157,7 @@ $strDanish = 'Данське';
 $strData = 'Дані';
 $strDataDict = 'Словник даних';
 $strDataOnly = 'Лише дані';
-$strDatabase = 'БД ';
+$strDatabase = 'БД';
 $strDatabaseExportOptions = 'Налаштування експорту бази даних';
 $strDatabaseHasBeenDropped = 'Базу даних %s знищено.';
 $strDatabaseNoTable = 'Ця база даних не містить таблиць!';
@@ -552,7 +552,7 @@ $strSelectNumRows = 'по запиту';
 $strSelectTables = 'Вибрати таблиці';
 $strSend = 'Відіслати';
 $strSent = 'Відправлено';
-$strServer = 'Сервер %s';
+$strServer = 'Сервер';
 $strServerChoice = 'Вибір сервера';
 $strServerStatus = 'Інформація про роботу сервера';
 $strServerStatusUptime = 'Цей MySQL сервер працює %s. Стартував %s.';
diff --git a/lang/ukrainian-windows-1251.inc.php b/lang/ukrainian-windows-1251.inc.php
index ad181c4ba..44a4bc701 100644
--- a/lang/ukrainian-windows-1251.inc.php
+++ b/lang/ukrainian-windows-1251.inc.php
@@ -156,7 +156,7 @@ $strDanish = '
 $strData = '����';
 $strDataDict = '������� �����';
 $strDataOnly = '���� ����';
-$strDatabase = '�� ';
+$strDatabase = '��';
 $strDatabaseExportOptions = '������������ �������� ���� �����';
 $strDatabaseHasBeenDropped = '���� ����� %s �������.';
 $strDatabaseNoTable = '�� ���� ����� �� ������ �������!';
@@ -551,7 +551,7 @@ $strSelectNumRows = '
 $strSelectTables = '������� �������';
 $strSend = '³������';
 $strSent = '³���������';
-$strServer = '������ %s';
+$strServer = '������';
 $strServerChoice = '���� �������';
 $strServerStatus = '���������� ��� ������ �������';
 $strServerStatusUptime = '��� MySQL ������ ������ %s. ��������� %s.';
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index cd4391659..c2218c85c 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -924,8 +924,8 @@ if ($is_minimum_common == FALSE) {
         // 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);
+            $cfg['Servers'][$key]['verbose'] = $GLOBALS['strServer'] . $key;
+            $val['verbose']                  = $GLOBALS['strServer'] . $key;
         }
     }