Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rb812eb010aa5c6d01ef10b19d6325900b7ae5963 -r2df341677611e4e0328f626b763dbeb655c04801
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b812eb010aa5c6d01ef10b19d6325900b7ae5963)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2df341677611e4e0328f626b763dbeb655c04801)
@@ -3,8 +3,6 @@
 activity.helptext = Individual peer evaluation.
 tool.display.name = Peer Evaluation Tool
 tool.description = Tool for individual peer evaluation.
-errorPage.title = Error page
-errorPage.heading = Some error(s) occurred when handling your request
 label.authoring.heading = Peer Evaluation Authoring
 label.author.title = Peer Evaluation
 label.authoring.heading.basic = Basic
@@ -31,14 +29,14 @@
 label.completed = Completed
 label.finish = Finish
 message.monitoring.summary.no.session = No session available
-define.later.message = Please wait for the instructor to complete the contents of this activity.
+define.later.message = Please wait for the teacher to complete the content of this activity
 button.try.again = Try again
 label.authoring.advanced.reflectOnActivity = Add a notebook at end of Peer Evaluation with the following instructions:
 title.reflection = Notebook Entry
 label.continue = Continue
 message.no.reflection.available = No notebook entry has been added.
-message.alertContentEdit = Warning: One of more learners have accessed this activity. Changing this content will result in learners getting different information.
-message.warnLockOnFinish = Note: After you click on {0}, if you come back to this Peer Evaluation, you will not be able to rate new students.
+message.alertContentEdit = Caution: This activity has been viewed by one or more learners. Any modifications to this content will cause learners to receive inconsistent information.
+message.warnLockOnFinish = Be aware: Once you finish this activity, when returning to it, you will no longer be able to add or make changes.
 message.activityLocked = The instructor has set this activity not to allow you to view or rate any more students after you have finished it.
 label.on = On
 label.off = Off
@@ -49,7 +47,7 @@
 label.average.rating = Average rating {0}/{1} votes
 label.redo = Redo ratings
 label.rating.criterias = Rating criteria
-label.add.criteria = Add criterion
+label.add.criteria = Add criteria
 label.your.rating = Your rating is {0}
 label.you.gave.rating = You gave a rating of {0}
 label.avg.rating = Avg rating {0} out of {1} votes
@@ -77,7 +75,7 @@
 label.comment = Comment
 label.show.ratings.left.for.user = After completion, show feedback left for  the current student
 label.comment.minimum.number.words = Minimum number of words in a comment{0}
-label.no.users = There are no students available for rating. Press Refresh to update.
+label.no.users = There are no students available for rating. Press Refresh.
 label.no.ratings.left = No ratings left
 label.cant.rate = This student cannot be rated as it attracted the maximum number of rates already.
 label.refresh = Refresh
@@ -235,7 +233,7 @@
 label.my.progress = My progress
 label.progress = Progress
 label.skip.to.main.content = Skip to the main content
-label.your.lesson.completion = Your lesson completion
+label.your.lesson.completion = Your lesson progression
 label.your.portrait = Your profile portrait
 label.lesson.name = Lesson name
 label.activity.name = Activity name
@@ -247,3 +245,6 @@
 label.completed.activity = Activity completed
 label.current.activity = Current activity
 label.not.started.activity = Activity not reached yet
+label.rating.rubrics.require.ratings.tooltip.learner = Please assign evaluation to all rubrics and all peers. No blank evaluations allowed.
+label.settings = Settings
+email.crtieria.table.title = Comparison