diff -r 47bf177d07e2 -r 4241c756c278 core/sm_stringutil.cpp
--- a/core/sm_stringutil.cpp	Sat Aug 18 22:51:25 2007 +0000
+++ b/core/sm_stringutil.cpp	Sun Aug 19 13:25:42 2007 +0000
@@ -55,10 +55,14 @@
 	Translation pTrans;
 	TransError err;
 
-	err = g_pCorePhrases->GetTranslation(phrase, g_Translator.GetServerLanguage(), &pTrans);
-	if (err != Trans_Okay && g_Translator.GetServerLanguage() != CORELANG_ENGLISH)
+	err = g_pCorePhrases->GetTranslation(phrase, g_Translator.GetClientLanguage(client), &pTrans);
+	if (err != Trans_Okay)
 	{
-		err = g_pCorePhrases->GetTranslation(phrase, CORELANG_ENGLISH, &pTrans);
+		err = g_pCorePhrases->GetTranslation(phrase, g_Translator.GetServerLanguage(), &pTrans);
+		if (err != Trans_Okay && g_Translator.GetServerLanguage() != CORELANG_ENGLISH)
+		{
+			err = g_pCorePhrases->GetTranslation(phrase, CORELANG_ENGLISH, &pTrans);
+		}
 	}
 
 	if (err != Trans_Okay)
@@ -123,7 +127,7 @@
 	}
 
 	max_params = pTrans.fmt_count;
-	
+
 	if (max_params)
 	{
 		/* Check if we're going to over the limit */