Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -red03685251f04878ebf4e26afae1b090a79a06c2 -rf220f0035f96f5bcb863d48b0eb55f3ec7fa635e
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision ed03685251f04878ebf4e26afae1b090a79a06c2)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision f220f0035f96f5bcb863d48b0eb55f3ec7fa635e)
@@ -75,16 +75,16 @@
 	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception {
 		log.debug("User:"+request.getRemoteUser());
 		List<IndexLinkBean> headerLinks = new ArrayList<IndexLinkBean>();
-		headerLinks.add(new IndexLinkBean("Dummy Monitor Page","javascript:openDummyMonitor()"));
-		headerLinks.add(new IndexLinkBean("My Profile", "javascript:openProfile('" + request.getRemoteUser()+"')"));
+		headerLinks.add(new IndexLinkBean("index.dummymonitor","javascript:openDummyMonitor()"));
+		headerLinks.add(new IndexLinkBean("index.myprofile", "javascript:openProfile('" + request.getRemoteUser()+"')"));
 		if (request.isUserInRole(Role.SYSADMIN)) {
 			log.debug("user is sysadmin");
-			headerLinks.add(new IndexLinkBean("System Administration", "javascript:openSysadmin()"));
-			headerLinks.add(new IndexLinkBean("Course Management", "javascript:openOrgManagement(" + service.getRootOrganisation().getOrganisationId()+")"));
+			headerLinks.add(new IndexLinkBean("index.sysadmin", "javascript:openSysadmin()"));
+			headerLinks.add(new IndexLinkBean("index.courseman", "javascript:openOrgManagement(" + service.getRootOrganisation().getOrganisationId()+")"));
 		}
 		if (request.isUserInRole(Role.AUTHOR)) {
 			log.debug("user is author");
-			headerLinks.add(new IndexLinkBean("Author", "javascript:openAuthor()"));
+			headerLinks.add(new IndexLinkBean("index.author", "javascript:openAuthor()"));
 		}
 		log.debug("set headerLinks in request");
 		request.setAttribute("headerLinks", headerLinks);
@@ -127,17 +127,17 @@
 		List<IndexLinkBean> links = new ArrayList<IndexLinkBean>();
 		if(isSysAdmin){
 			if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
-				links.add(new IndexLinkBean("Manage Classes", "javascript:openOrgManagement(" + org.getOrganisationId()+")"));
+				links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")"));
 			}
 		}
 		if (contains(roles, Role.ROLE_COURSE_ADMIN) || contains(roles, Role.ROLE_COURSE_MANAGER) || contains(roles,Role.ROLE_STAFF)) {
 			if (orgBean.getType().equals(OrganisationType.COURSE_TYPE)) {
 				if((!isSysAdmin)&&(contains(roles, Role.ROLE_COURSE_ADMIN) || contains(roles, Role.ROLE_COURSE_MANAGER))){
-					links.add(new IndexLinkBean("Manage Classes", "javascript:openOrgManagement(" + org.getOrganisationId()+")"));
+					links.add(new IndexLinkBean("index.classman", "javascript:openOrgManagement(" + org.getOrganisationId()+")"));
 				}
-				links.add(new IndexLinkBean("Add Lesson", "javascript:openAddLesson(" + org.getOrganisationId()+",'')"));
+				links.add(new IndexLinkBean("index.addlesson", "javascript:openAddLesson(" + org.getOrganisationId()+",'')"));
 			}else{//CLASS_TYPE
-				links.add(new IndexLinkBean("Add Lesson","javascript:openAddLesson("+org.getParentOrganisation().getOrganisationId()+","+org.getOrganisationId()+")"));
+				links.add(new IndexLinkBean("index.addlesson","javascript:openAddLesson("+org.getParentOrganisation().getOrganisationId()+","+org.getOrganisationId()+")"));
 			}
 		}
 		
@@ -149,13 +149,14 @@
 			if(!lesson.isPreviewLesson()){
 				List<IndexLinkBean> lessonLinks = new ArrayList<IndexLinkBean>();
 				if(contains(roles,Role.ROLE_COURSE_MANAGER)||contains(roles,Role.ROLE_STAFF)){
-					if(lesson.getLessonStateId()!=lesson.REMOVED_STATE){
-						lessonLinks.add(new IndexLinkBean("Monitor", "javascript:openMonitorLesson(" + lesson.getLessonId()+")"));
+					if(!lesson.getLessonStateId().equals(lesson.REMOVED_STATE)){
+						lessonLinks.add(new IndexLinkBean("index.monitor", "javascript:openMonitorLesson(" + lesson.getLessonId()+")"));
 					}
 				}
 				if(contains(roles,Role.ROLE_LEARNER)){
-					if((lesson.getLessonStateId()==lesson.STARTED_STATE)||(lesson.getLessonStateId()==lesson.FINISHED_STATE)){
-						lessonLinks.add(new IndexLinkBean("Participate","javascript:openLearner("+lesson.getLessonId()+")"));
+					log.debug("Lesson State:"+lesson.getLessonStateId());
+					if(lesson.getLessonStateId().equals(lesson.STARTED_STATE)||lesson.getLessonStateId().equals(lesson.FINISHED_STATE)){
+						lessonLinks.add(new IndexLinkBean("index.participate","javascript:openLearner("+lesson.getLessonId()+")"));
 					}
 				}
 				IndexLessonBean lessonBean = new IndexLessonBean(lesson.getLessonName(), lessonLinks);