--- a/trunk/src/wings_lang.erl
+++ b/trunk/src/wings_lang.erl
@@ -4,12 +4,12 @@
 %%     Implementation of languages.
 %%
 %%  Copyright (c) 2004 Riccardo Venier, Dan Gudmundsson
-%%                2004-2008 Dan Gudmundsson, Bjorn Gustavsson
+%%                2004-2009 Dan Gudmundsson, Bjorn Gustavsson
 %%
 %%  See the file "license.terms" for information on usage and redistribution
 %%  of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 %%
-%%     $Id: wings_lang.erl 429 2008-10-21 04:11:19Z bjorng $
+%%     $Id: wings_lang.erl 601 2009-04-24 04:40:16Z bjorng $
 %%
 %%  Totally rewritten but Riccardo is still the one who did the hard work.
 %%
@@ -204,11 +204,10 @@
 expand_utf8_1([], _) -> [].
 
 expand_utf8_2([{Key,Str0}|T], Mod, Name) ->
-    case wings_util:expand_utf8(Str0) of
-	{Str,0} ->
-	    [{Key,Str}|expand_utf8_2(T, Mod, Name)];
-	{_,_} ->
-	    %% Errors in the string.
-	    throw({error,{Mod,Name,Key}})
+    case unicode:characters_to_list(list_to_binary(Str0)) of
+	{error,_,_} ->
+	    throw({error,{Mod,Name,Key}});
+	Str when is_list(Str) ->
+	    [{Key,Str}|expand_utf8_2(T, Mod, Name)]
     end;
 expand_utf8_2([], _, _) -> [].