diff --git a/tjreports/languages/administrator/en-GB/en-GB.com_tjreports.ini b/tjreports/languages/administrator/en-GB/en-GB.com_tjreports.ini
index 76e60e9..7bec8cf 100755
--- a/tjreports/languages/administrator/en-GB/en-GB.com_tjreports.ini
+++ b/tjreports/languages/administrator/en-GB/en-GB.com_tjreports.ini
@@ -2,39 +2,39 @@ COM_TJREPORTS="Tjreports"
COM_TJREPORTS_COMPONENT_LABEL="Tjreports"
COM_TJREPORTS_CONFIGURATION="Tjreports Configuration"
COM_TJREPORTS_ACCESS_HEADING="Access"
-COM_TJREPORTS_COMPONENT_DESC="This component is used to access all the report at single place."
-COM_TJREPORTS_N_ITEMS_ARCHIVED="%d items successfully archived"
-COM_TJREPORTS_N_ITEMS_ARCHIVED_1="%d item successfully archived"
-COM_TJREPORTS_N_ITEMS_CHECKED_IN_0="No item successfully checked in"
-COM_TJREPORTS_N_ITEMS_CHECKED_IN_1="%d item successfully checked in"
-COM_TJREPORTS_N_ITEMS_CHECKED_IN_MORE="%d items successfully checked in"
-COM_TJREPORTS_N_ITEMS_DELETED="%d items successfully deleted"
-COM_TJREPORTS_N_ITEMS_DELETED_1="%d item successfully deleted"
-COM_TJREPORTS_N_ITEMS_PUBLISHED="%d items successfully published"
-COM_TJREPORTS_N_ITEMS_PUBLISHED_1="%d item successfully published"
-COM_TJREPORTS_N_ITEMS_TRASHED="%d items successfully trashed"
-COM_TJREPORTS_N_ITEMS_TRASHED_1="%d item successfully trashed"
-COM_TJREPORTS_N_ITEMS_UNPUBLISHED="%d items successfully unpublished"
-COM_TJREPORTS_N_ITEMS_UNPUBLISHED_1="%d item successfully unpublished"
-COM_TJREPORTS_NO_ITEM_SELECTED="No items selected"
-COM_TJREPORTS_SAVE_SUCCESS="Item successfully saved"
-COM_TJREPORTS_ITEM_ID_SELECT_LABEL="Select the item ID"
-COM_TJREPORTS_ITEM_ID_SELECT_LABEL_FORM="Select the Item ID to Edit (Set up as 0 if you want to set up as add form)"
+COM_TJREPORTS_COMPONENT_DESC="Manage all your reports in one place."
+COM_TJREPORTS_N_ITEMS_ARCHIVED="%d items archived successfully."
+COM_TJREPORTS_N_ITEMS_ARCHIVED_1="%d item archived successfully."
+COM_TJREPORTS_N_ITEMS_CHECKED_IN_0="No items were checked in."
+COM_TJREPORTS_N_ITEMS_CHECKED_IN_1="%d item checked in successfully."
+COM_TJREPORTS_N_ITEMS_CHECKED_IN_MORE="%d items checked in successfully."
+COM_TJREPORTS_N_ITEMS_DELETED="%d items deleted successfully."
+COM_TJREPORTS_N_ITEMS_DELETED_1="%d item deleted successfully."
+COM_TJREPORTS_N_ITEMS_PUBLISHED="%d items published successfully."
+COM_TJREPORTS_N_ITEMS_PUBLISHED_1="%d item published successfully."
+COM_TJREPORTS_N_ITEMS_TRASHED="%d items moved to trash."
+COM_TJREPORTS_N_ITEMS_TRASHED_1="%d item moved to trash."
+COM_TJREPORTS_N_ITEMS_UNPUBLISHED="%d items unpublished successfully."
+COM_TJREPORTS_N_ITEMS_UNPUBLISHED_1="%d item unpublished successfully."
+COM_TJREPORTS_NO_ITEM_SELECTED="Please select at least one item."
+COM_TJREPORTS_SAVE_SUCCESS="Your changes have been saved successfully."
+COM_TJREPORTS_ITEM_ID_SELECT_LABEL="Choose Item ID"
+COM_TJREPORTS_ITEM_ID_SELECT_LABEL_FORM="Choose the Item ID to edit. Use 0 to add a new item."
COM_TJREPORTS_FIELDSET_ITEM_ID_SELECT_LABEL="Required Settings"
-COM_TJREPORTS_FILTER_SELECT_LABEL=" - Select %s - "
-COM_TJREPORTS_TEST_LABEL="Test label"
+COM_TJREPORTS_FILTER_SELECT_LABEL=" - Choose %s - "
+COM_TJREPORTS_TEST_LABEL="Test Label"
COM_TJREPORTS_FIELDSET_RULES="Permissions"
COM_TJREPORTS_FROM_FILTER="From %s"
COM_TJREPORTS_TO_FILTER="To %s"
COM_TJREPORTS_VIEW_FILE="[View File]"
-COM_TJREPORTS_ITEMS_SUCCESS_DUPLICATED="Items successfully duplicated"
+COM_TJREPORTS_ITEMS_SUCCESS_DUPLICATED="Items duplicated successfully."
COM_TJREPORTS_TITLE_TESTS="Reports"
COM_TJREPORTS_TITLE="Reports"
-COM_TJREPORTS_NEW="Add New Report"
+COM_TJREPORTS_NEW="Create New Report"
COM_TJREPORTS_EDIT="Edit Report"
-COM_TJREPORTS_LIST_SAVED_QUERY="Saved Query Count"
-COM_TJREPORTS_LIST_ID="Id"
+COM_TJREPORTS_LIST_SAVED_QUERY="Saved Queries"
+COM_TJREPORTS_LIST_ID="ID"
COM_TJREPORTS_TITLE_REPORT="Reports"
COM_TJREPORTS_CSV_EXPORT="CSV Export"
diff --git a/tjreports/languages/site/en-GB/en-GB.com_tjreports.ini b/tjreports/languages/site/en-GB/en-GB.com_tjreports.ini
index dc3098d..5b690de 100755
--- a/tjreports/languages/site/en-GB/en-GB.com_tjreports.ini
+++ b/tjreports/languages/site/en-GB/en-GB.com_tjreports.ini
@@ -1,19 +1,19 @@
COM_TJREPORTS="Tjreports"
-COM_TJREPORTS_ITEM_SAVED_SUCCESSFULLY="Item saved successfully"
-COM_TJREPORTS_ITEM_DELETED_SUCCESSFULLY="Item deleted successfully"
-COM_TJREPORTS_ITEM_NOT_LOADED="Could not load the item"
+COM_TJREPORTS_ITEM_SAVED_SUCCESSFULLY="Your item has been saved successfully!"
+COM_TJREPORTS_ITEM_DELETED_SUCCESSFULLY="The item has been deleted successfully."
+COM_TJREPORTS_ITEM_NOT_LOADED="We couldn't load the item. Please try again."
COM_TJREPORTS_VIEW_FILE="[View File]"
COM_TJREPORTS_ADD_ITEM="Add"
COM_TJREPORTS_EDIT_ITEM="Edit"
COM_TJREPORTS_DELETE_ITEM="Delete"
COM_TJREPORTS_DELETE_QUERY="Delete Query"
COM_TJREPORTS_SAVE_QUERY="Save Query"
-COM_TJREPORTS_DELETE_MESSAGE="Are you sure that you want delete this item?"
+COM_TJREPORTS_DELETE_MESSAGE="Are you sure you want to delete this item?"
COM_TJREPORTS_PUBLISH_ITEM="Publish"
COM_TJREPORTS_UNPUBLISH_ITEM="Unpublish"
-COM_TJREPORTS_NO_ITEMS="There are no items in the list"
+COM_TJREPORTS_NO_ITEMS="No items found in the list."
COM_TJREPORTS_SEARCH_TOOLS="Search Tools"
-COM_TJREPORTS_SEARCH_TOOLS_DESC=""
+COM_TJREPORTS_SEARCH_TOOLS_DESC="Use these tools to refine your search."
COM_TJREPORTS_SEARCH_FILTER_SUBMIT="Search"
COM_TJREPORTS_SEARCH_FILTER_CLEAR="Clear"
COM_TJREPORTS_SEARCH_FILTER_DATE_FORMAT="Dates should be in this format: \"YYYY-MM-DD\". Some filter fields have been ignored."
@@ -24,17 +24,16 @@ COM_TJREPORTS_SELONE_REPORTS="Select Report"
COM_TJREPORTS_SELONE_QUERY="Select Query"
COM_TJREPORTS_NO_REPORT="No report found. Please select any report"
-
-;Common for reports
-COM_TJREPORTS_FILTER_SELECT_ACCESSLEVEL="- Select Access Level -"
-COM_TJREPORTS_FILTER_SELECT_COURSE="- Select Course -"
-COM_TJREPORTS_FILTER_SELECT_LESSON="Select lesson -"
-COM_TJREPORTS_FILTER_SELECT_COURSE_CATEGORY="- Select Category -"
-COM_TJREPORTS_FILTER_SELECT_COURSE_TYPE="- Select Type -"
-COM_TJREPORTS_FILTER_SELECT_USER="- Select User -"
+; Common Filters for Reports
+COM_TJREPORTS_FILTER_SELECT_ACCESSLEVEL="- Choose Access Level -"
+COM_TJREPORTS_FILTER_SELECT_COURSE="- Choose Course -"
+COM_TJREPORTS_FILTER_SELECT_LESSON="- Choose Lesson -"
+COM_TJREPORTS_FILTER_SELECT_COURSE_CATEGORY="- Choose Category -"
+COM_TJREPORTS_FILTER_SELECT_COURSE_TYPE="- Choose Type -"
+COM_TJREPORTS_FILTER_SELECT_USER="- Choose User -"
COM_TJREPORTS_REPORT_USERNAME="Name"
COM_TJREPORTS_REPORT_USERUSERNAME="Username"
-COM_TJREPORTS_REPORT_USEREMAIL="E-mail"
+COM_TJREPORTS_REPORT_USEREMAIL="Email"
COM_TJREPORTS_REPORT_TIMESPENT="Time Spent"
COM_TJREPORTS_REPORTS_CANNOT_SELECT_NONE="You need to keep at-least 1 column"
COM_TJREPORTS_SAVE_THIS_QUERY="Want to save this?"
@@ -45,18 +44,18 @@ COM_TJREPORTS_DELETE_CONFIRMATION_MESSAGE="Do you want to delete ?"
;new
COM_TJREPORTST_FILTER_SEARCH_DESC_MENROLLMENT="Search by name, username"
-COM_TJREPORTS_HIDE_SHOW_COLUMNS="Hide / Show Columns"
-COM_TJREPORTS_WANT_TO_SAVE_THIS="want to save this?"
-COM_TJREPORTS_EMAIL_PARAMS="E-mail Settings"
+COM_TJREPORTS_HIDE_SHOW_COLUMNS="Show/Hide Columns"
+COM_TJREPORTS_WANT_TO_SAVE_THIS="Do you want to save this?"
+COM_TJREPORTS_EMAIL_PARAMS="Email Settings"
COM_TJREPORTS_SLIDEOUT="Slide Out"
COM_TJREPORTS_SESSIONS="Sessions"
; Single Course report
COM_TJREPORTS_JVIEW_SINGLE_COURSE_REPORTS="View Single Course Report"
-COM_TJREPORTS_JVIEW_SINGLE_COURSE_REPORTS_DESC="Allow user to view Single Reports in this Extension"
-COM_TJREPORTS_MESSAGE_SINGLE_REPORT="Please select course to view this report."
-COM_TJREPORTS_SELECT_COURSE_MESSAGE="Browse search tool for required report."
+COM_TJREPORTS_JVIEW_SINGLE_COURSE_REPORTS_DESC="Allows users to view single course reports."
+COM_TJREPORTS_MESSAGE_SINGLE_REPORT="Please select a course to view this report."
+COM_TJREPORTS_SELECT_COURSE_MESSAGE="Use the search tool to find the report you need."
COM_TJREPORTS_FILTER_DATE_COURSE_COMPLETE_TO="Completion To"
COM_TJREPORTS_FILTER_DATE_COURSE_COMPLETE_FROM="Completion From"
COM_TJREPORTS_LESSON_STATUS_BFLSTUDENT="Lesson Status"
@@ -66,14 +65,14 @@ COM_TJREPORTS_LESSON_SCORE_BFLSTUDENT="Lesson Score"
COM_TJREPORTS_EMP_GROUP="User Group"
COM_TJREPORTS_EMP_EMAIL="User Email"
COM_TJREPORTS_EMP_CODE="User Code"
-COM_TJREPORTS_EMP_NAME="User Name "
+COM_TJREPORTS_EMP_NAME="User Name"
COM_TJREPORTS_TITLE_STUDENT_LESSON_REPORT="Single Course Report"
COM_TJREPORTS_FILTER_DATE_ATTEMPT_TO="Attempt To"
COM_TJREPORTS_FILTER_DATE_ATTEMPT_FROM="Attempt From"
COM_TJREPORTS_FILTER_DATE_LESSON_ENDS_TO="Lesson End Date"
COM_TJREPORTS_FILTER_DATE_LESSON_START_FROM="Lesson Start Date"
-COM_TJREPORTS_FILTER_DATE_ENROLL_TO="Enroll To"
-COM_TJREPORTS_FILTER_DATE_ENROLL_FROM="Enroll From"
+COM_TJREPORTS_FILTER_DATE_ENROLL_TO="Enrollment To"
+COM_TJREPORTS_FILTER_DATE_ENROLL_FROM="Enrollment From"
COM_TJREPORTS_REPORT_VIEW_TITLE="TJ - REPORTS"
COM_TJREPORTS_AVAILABLE_REPORT_LIST="Available Reports:"
@@ -82,19 +81,20 @@ COM_TJREPORTS_AVAILABLE_REPORT_LIST="Available Reports:"
COM_TJREPORTS_COURSES_TYPE_FILTER_FREE="Free"
COM_TJREPORTS_COURSES_TYPE_FILTER_PAID="Paid"
COM_TJREPORTS_HIGHEST_ATTEMPT="Highest Attempt"
-COM_TJREPORTS_AVERAGE_ATTEMPT="Average attempts"
-COM_TJREPORTS_FIRST_ATTEMPT="First attempt"
-COM_TJREPORTS_LAST_COMPLETED_ATTEMPT="Last completed attempt"
+COM_TJREPORTS_AVERAGE_ATTEMPT="Average Attempts"
+COM_TJREPORTS_FIRST_ATTEMPT="First Attempt"
+COM_TJREPORTS_LAST_COMPLETED_ATTEMPT="Last Completed Attempt"
+
COM_TJREPORTS_FORM_OPT_COURSE_CERTIFICATE_TERM_NOCERTI="No Certificate"
-COM_TJREPORTS_FORM_OPT_COURSE_CERTIFICATE_TERM_COMPALL="Complete all Lessons"
-COM_TJREPORTS_FORM_OPT_COURSE_CERTIFICATE_TERM_PASSALL="Pass all Lessons"
+COM_TJREPORTS_FORM_OPT_COURSE_CERTIFICATE_TERM_COMPALL="Complete All Lessons"
+COM_TJREPORTS_FORM_OPT_COURSE_CERTIFICATE_TERM_PASSALL="Pass All Lessons"
-COM_TJREPORTS_CSV_EXPORT="CSV Export"
-COM_TJREPORTS_EXPORT_FILE_ERROR="Something went wrong."
-COM_TJREPORTS_EXPORT_FILE_NOTICE="Do not click anywhere or refresh the page until CSV download successfully."
-COM_TJREPORTS_EXPORT_FILE_SUCCESS="100% Download Complete."
+COM_TJREPORTS_CSV_EXPORT="Export as CSV"
+COM_TJREPORTS_EXPORT_FILE_ERROR="Something went wrong during export."
+COM_TJREPORTS_EXPORT_FILE_NOTICE="Please do not click anywhere or refresh until the CSV download is complete."
+COM_TJREPORTS_EXPORT_FILE_SUCCESS="Your CSV download is complete."
-COM_TJREPORTS_ERROR_MSG="Something went wrong!"
+COM_TJREPORTS_ERROR_MSG="An error occurred. Please try again."
JOPTION_ACCESS_SHOW_ALL_LEVELS="Show All Access Levels"
COM_TJREPORTS_ENTER_TITLE="Enter title for the Query"