Index: lams_admin/conf/language/ApplicationResources.properties
===================================================================
diff -u -ra746fea3d2904d3d7a5b6129c36a24209b8b0d78 -r364348244042df502f6bf898acfe76247bf4e4e4
--- lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision a746fea3d2904d3d7a5b6129c36a24209b8b0d78)
+++ lams_admin/conf/language/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 364348244042df502f6bf898acfe76247bf4e4e4)
@@ -30,33 +30,6 @@
 organisation.state.ARCHIVED=Archived
 organisation.state.REMOVED=Removed
 
-#======================== Locale Languages =======================#
-locale.language.en=English
-locale.language.zh=Chinese
-locale.language.es=Spanish
-locale.language.mi=Maori
-locale.language.de=German
-locale.language.fr=French
-locale.language.it=Italian
-locale.language.no=Norwegian
-locale.language.sw=Swedish
-locale.language.ko=Korean
-locale.language.pl=Polish
-locale.language.pt=Portuguese
-locale.language.hu=Hungarian
-locale.language.bg=Bulgarian
-locale.language.cy=Welsh
-locale.language.th=Thai
-locale.language.el=Greek
-
-#======================== Locale Countries =======================#
-locale.country.AU=Australia
-locale.country.US=United States
-locale.country.CN=China
-locale.country.NZ=New Zealand
-locale.country.BR=Brazil
-locale.country.GB=United Kindom
-
 #======================== User Management Screens =======================#
 admin.user.management = User Management
 admin.user.entry = User Entry
Index: lams_admin/web/organisation.jsp
===================================================================
diff -u -r8b1596152d189c2906d2d84317cbad31608a998e -r364348244042df502f6bf898acfe76247bf4e4e4
--- lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision 8b1596152d189c2906d2d84317cbad31608a998e)
+++ lams_admin/web/organisation.jsp	(.../organisation.jsp)	(revision 364348244042df502f6bf898acfe76247bf4e4e4)
@@ -55,10 +55,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>
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>