Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r5e63656a12c02f7476564e278b43ff4ce86ac930 -r3dbf966d900adefc34cdad501d3c392118451cd9
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 5e63656a12c02f7476564e278b43ff4ce86ac930)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 3dbf966d900adefc34cdad501d3c392118451cd9)
@@ -44,8 +44,7 @@
 error.roles.invalid  =One or more roles are invalid.  {0}
 error.fail.add  =Failed to add user.
 error.authmethod.invalid  =Invalid authentication method. {0}
-error.flash.theme.invalid  =Invalid flash theme. {0}
-error.html.theme.invalid  =Invalid html theme. {0}
+error.theme.invalid  =Invalid theme. {0}
 error.locale.invalid  =Invalid locale. {0}
 msg.user.add.to.parent.group  =User/s marked with a '*' will be automatically added to the parent course with the same roles.
 msg.add.to.org  =User will be added to {0}.
@@ -277,7 +276,6 @@
 config.server.url.context.path  =Server URL context path
 config.version  =Version
 config.temp.dir  =Temporary files directory
-config.dump.dir  =Flash dump files directory
 config.ear.dir  =EAR directory
 config.smtp.server  =SMTP server
 config.lams.support.email  =LAMS support email
@@ -302,8 +300,7 @@
 config.xmpp.conference  =Chat server conference
 config.xmpp.admin  =Chat server admin username
 config.xmpp.password  =Chat server admin password
-config.default.flash.theme  =Default flash theme
-config.default.html.theme  =Default HTML theme
+config.default.theme  =Default theme
 config.allow.direct.lesson.launch  =Allow direct lesson launch
 config.community.enable  =Enable LAMS community
 config.allow.live.edit  =Allow Live Edit
@@ -409,11 +406,7 @@
 admin.themes.makeDefault  =Make default
 admin.themes.deleteConfirm  =Are you sure you want to delete this theme?
 admin.themes.nameAlreadyExists  =Please enter a new unused theme name, or click the edit icon to edit.
-admin.themes.type  =Type
-admin.themes.html  =HTML
-admin.themes.flash  =Flash
-label.html.htmlTheme  =HTML theme
-label.html.flashTheme  =Flash theme
+label.theme  =Theme
 config.use.internal.smtp.server  =Use internal SMTP server
 label.email  =Email
 title.clone.lessons  =Clone lessons
@@ -449,7 +442,6 @@
 admin.user.enable.flash.for.learner.window  =Enable Flash for learner window
 admin.user.time.zone  =Time Zone
 config.show.all.my.lesson.link  =Show "All My Lessons" link in User's profile
-config.force.mobile.use.flashlesh  =Force mobile devices to use learner interface without Flash
 config.display.print.button  =Display a print button when the lesson is completed
 sysadmin.lessonFinishUrl  =Lesson finish callback URL
 admin.servertimezone.server.timezone.management  =Server timezone management