Index: lams_admin/web/user.jsp
===================================================================
diff -u -rf741601968539b96b0d6e9df19ec21fab64c16e2 -r364348244042df502f6bf898acfe76247bf4e4e4
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision f741601968539b96b0d6e9df19ec21fab64c16e2)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 364348244042df502f6bf898acfe76247bf4e4e4)
@@ -101,10 +101,7 @@
 			<html-el:select property="localeId">
 				<c:forEach items="${locales}" var="locale">
 					<html-el:option value="${locale.localeId}">
-						<fmt:message key="locale.language.${locale.languageIsoCode}"/>
-						<c:if test="${!empty locale.countryIsoCode}">
-							&nbsp;(<fmt:message key="locale.country.${locale.countryIsoCode}"/>)
-						</c:if>
+						<c:out value="${locale.description}" />
 					</html-el:option>
 				</c:forEach>	
 			</html-el:select>