diff --git a/lang/bg.php b/lang/bg.php
index de71d2fd2d15938a3595ad122c2a3142c6d3616c..21a7af7d2abbeaa7ab349bbd7426cab0fa18defe 100644
--- a/lang/bg.php
+++ b/lang/bg.php
@@ -1,7 +1,7 @@
 <?php
 $translations = array(
 	'General_Locale' => 'bg_BG.UTF-8',
-	'General_TranslatorName' => '<a href="http://kristalinchavdarov.net/">Kristalin Chavdarov</a>, <a href="http://coffebreak.info/">Andon Ivanov</a>, Tom Atanasov, Dimitar Stamenov, <a href="http://www.blog7.org/">Панайотис Кондоянис</a>',
+	'General_TranslatorName' => 'Kristalin Chavdarov, Andon Ivanov, Tom Atanasov, Dimitar Stamenov',
 	'General_TranslatorEmail' => 'kristalin[at]kividesign[dot]com, Virosss[at]abv[dot]bg, tomivr[at]abv[dot]bg, pak69[at]abv[dot]bg, pamir[at]abv[dot]bg',
 	'General_EnglishLanguageName' => 'Bulgarian',
 	'General_OriginalLanguageName' => 'Български',
diff --git a/lang/da.php b/lang/da.php
index 3ae11eddf61db99143e16f25ed86818e6b8651ef..cf21f4233b7b20d6219d9567dc3ab43481d5c028 100644
--- a/lang/da.php
+++ b/lang/da.php
@@ -1,7 +1,7 @@
 <?php
 $translations = array(
 	'General_Locale' => 'da_DK.UTF-8',
-	'General_TranslatorName' => '<a href="http://danieljuhl.dk/">Daniel Juhl</a>, jan madsen',
+	'General_TranslatorName' => 'Daniel Juhl, jan madsen',
 	'General_TranslatorEmail' => 'danieljuhl@gmail.com, jsm@janz.dk',
 	'General_EnglishLanguageName' => 'Danish',
 	'General_OriginalLanguageName' => 'Dansk',
diff --git a/lang/fr.php b/lang/fr.php
index 48f35a4cb602663517810fef576d762e130d5823..37505b4d00b3074407de198340de871fc5dc9472 100644
--- a/lang/fr.php
+++ b/lang/fr.php
@@ -1,8 +1,8 @@
 <?php
 $translations = array(
 	'General_Locale' => 'fr_FR.UTF-8',
-	'General_TranslatorName' => '<a href="http://microsofttouch.fr/default/b/vincent/default.aspx">Vincent BIRET</a>, <a href="http://www.ludovicevrard.com">Ludovic Evrard</a>, <a href="http://www.ikux.fr">Daniel Castronovo</a>',
-	'General_TranslatorEmail' => 'admin@get-surf.com, piwik@ludovicevrard.be, daniel@castronovo.fr,',
+	'General_TranslatorName' => '<a href="http://microsofttouch.fr/default/b/vincent/default.aspx">Vincent BIRET</a>, <a href="http://www.ludovicevrard.com">Ludovic Evrard</a>, Daniel Castronovo',
+	'General_TranslatorEmail' => 'admin@get-surf.com, piwik@ludovicevrard.be, daniel@castronovo.fr',
 	'General_EnglishLanguageName' => 'French',
 	'General_OriginalLanguageName' => 'Français',
 	'General_LayoutDirection' => 'ltr',
diff --git a/lang/th.php b/lang/th.php
index 3350b2da4f50043fc5a506c1fffdf1d394a90f92..28b4e3b4c6bf82d0203f5a71d321bd42c8b13491 100644
--- a/lang/th.php
+++ b/lang/th.php
@@ -1,8 +1,8 @@
 <?php
 $translations = array(
 	'General_Locale' => 'th_TH.UTF-8',
-	'General_TranslatorName' => 'coyoty, <a href="http://thzaa.com/">Jaideejung007</a>',
-	'General_TranslatorEmail' => 'jaideejung007@gmail.com',
+	'General_TranslatorName' => 'designbyarm, coyoty, jaideejung007',
+	'General_TranslatorEmail' => 'admin@tuntikorn.com, jaideejung007@gmail.com',
 	'General_EnglishLanguageName' => 'Thai',
 	'General_OriginalLanguageName' => 'ภาษาไทย',
 	'General_LayoutDirection' => 'ltr',
diff --git a/lang/zh-cn.php b/lang/zh-cn.php
index 227a98616676004b3ae72cdedfa7f9ab8fe444b7..9212379113aee7ac4a1aeff72bba2463e1968842 100644
--- a/lang/zh-cn.php
+++ b/lang/zh-cn.php
@@ -1,8 +1,8 @@
 <?php
 $translations = array(
 	'General_Locale' => 'zh_CN.UTF-8',
-	'General_TranslatorName' => '翻译者姓名',
-	'General_TranslatorEmail' => '翻译者Email',
+	'General_TranslatorName' => 'Marine.Ming',
+	'General_TranslatorEmail' => 'albert.einstain@gmail.com',
 	'General_EnglishLanguageName' => 'Simplified Chinese',
 	'General_OriginalLanguageName' => '简体中文',
 	'General_HelloUser' => '您好， %s！',
diff --git a/tests/build-ci.xml b/tests/build-ci.xml
index 82c5e1f3c8b657210c86f2dc65b0abc957901a0b..4f98ce5808950e7f05ee97707ba4d0bcc2855771 100644
--- a/tests/build-ci.xml
+++ b/tests/build-ci.xml
@@ -43,7 +43,8 @@
 		<echo>PDO_MYSQL unit tests started</echo>
 
 		<exec executable="phpunit" dir="${basedir}/PHPUnit" failonerror="false" failifexecutionfails="true">
-            <!-- DEBUG: when test crash in the middle, enable this to see which test crashes. Note: remove \ from -\- below -->
+            <!-- DEBUG: when test crash in the middle, enable this to see which test crashes.
+                Note: remove \ from -\- below -->
             <arg line=" --testdox"/>
 		</exec>