From 71de1d124778ff203e26ac6e59e3d1fb9b82708a Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Wed, 6 Sep 2017 08:37:58 +0400
Subject: [PATCH 01/27] #1546 Updates

---
 application/language/en-US/common_lang.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/language/en-US/common_lang.php b/application/language/en-US/common_lang.php
index 0031c51c7..07aaa384d 100644
--- a/application/language/en-US/common_lang.php
+++ b/application/language/en-US/common_lang.php
@@ -14,13 +14,13 @@ $lang["common_det"] = "details";
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
 $lang["common_edit"] = "edit";
 $lang["common_email"] = "Email";
-$lang["common_email_invalid_format"] = "The email address is not in the proper format";
+$lang["common_email_invalid_format"] = "The email address is not in the correct format";
 $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_no"] = "No";
 $lang["common_export_excel_yes"] = "Yes";
 $lang["common_fields_required_message"] = "Fields in red are required";
 $lang["common_first_name"] = "First Name";
-$lang["common_first_name_required"] = "The first name is a required field.";
+$lang["common_first_name_required"] = "First Name is a required field.";
 $lang["common_first_page"] = "First";
 $lang["common_gender"] = "Gender";
 $lang["common_gender_female"] = "F";
@@ -34,7 +34,7 @@ $lang["common_import_remove_file"] = "Remove";
 $lang["common_import_select_file"] = "Select file";
 $lang["common_inv"] = "inv";
 $lang["common_last_name"] = "Last Name";
-$lang["common_last_name_required"] = "The last name is a required field";
+$lang["common_last_name_required"] = "Last Name is a required field";
 $lang["common_last_page"] = "Last";
 $lang["common_learn_about_project"] = "to learn the latest information about the project";
 $lang["common_list_of"] = "List of";
@@ -45,7 +45,7 @@ $lang["common_none_selected_text"] = "Nothing selected";
 $lang["common_or"] = "OR";
 $lang["common_phone_number"] = "Phone Number";
 $lang["common_phone_number_required"] = "";
-$lang["common_please_visit_my"] = "Please visit my";
+$lang["common_please_visit_my"] = "Please visit the";
 $lang["common_powered_by"] = "Powered by";
 $lang["common_price"] = "Price";
 $lang["common_print"] = "Print";
@@ -62,6 +62,6 @@ $lang["common_unknown"] = "Unknown";
 $lang["common_view_recent_sales"] = "View Recent Sales";
 $lang["common_website"] = "website";
 $lang["common_welcome"] = "Welcome";
-$lang["common_welcome_message"] = "Welcome to OSPOS, click a module below to get started!";
-$lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale Version";
-$lang["common_zip"] = "Zip";
+$lang["common_welcome_message"] = "Welcome to OSPOS, click a module below to get started";
+$lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale version";
+$lang["common_zip"] = "Postal Code";

From 48aa05f8589499861412f353e9fc2b02ee2964f7 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Wed, 6 Sep 2017 09:02:04 +0400
Subject: [PATCH 02/27] #1546 Updates

---
 application/language/en-US/config_lang.php | 96 +++++++++++-----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/application/language/en-US/config_lang.php b/application/language/en-US/config_lang.php
index a31c0a332..bdd8fe0df 100644
--- a/application/language/en-US/config_lang.php
+++ b/application/language/en-US/config_lang.php
@@ -56,43 +56,43 @@ $lang["config_custom7"] = "Custom Field 7";
 $lang["config_custom8"] = "Custom Field 8";
 $lang["config_custom9"] = "Custom Field 9";
 $lang["config_customer_reward"] = "Reward";
-$lang["config_customer_reward_duplicate"] = "Please use an unique reward name";
+$lang["config_customer_reward_duplicate"] = "Please use a unique reward name";
 $lang["config_customer_reward_enable"] = "Enable Customer Rewards";
-$lang["config_customer_reward_invalid_chars"] = "The reward name can not contain '_'";
+$lang["config_customer_reward_invalid_chars"] = "Reward Name can not contain '_'";
 $lang["config_customer_reward_required"] = "Reward is a required field";
 $lang["config_customer_sales_tax_support"] = "Customer Sales Tax Support";
 $lang["config_date_or_time_format"] = "Date and Time Filter";
 $lang["config_datetimeformat"] = "Date and Time Format";
 $lang["config_decimal_point"] = "Decimal Point";
-$lang["config_default_barcode_font_size_number"] = "The default barcode font size must be a number";
-$lang["config_default_barcode_font_size_required"] = "The default barcode font size is a required field";
-$lang["config_default_barcode_height_number"] = "The default barcode height must be a number";
-$lang["config_default_barcode_height_required"] = "The default barcode height is a required field";
-$lang["config_default_barcode_num_in_row_number"] = "The default barcode number in row must be a number";
-$lang["config_default_barcode_num_in_row_required"] = "The default barcode num in row is a required field";
-$lang["config_default_barcode_page_cellspacing_number"] = "The default barcode page cellspacing must be a number";
-$lang["config_default_barcode_page_cellspacing_required"] = "The default barcode page cellspacing is a required field";
-$lang["config_default_barcode_page_width_number"] = "The default barcode page width must be a number";
-$lang["config_default_barcode_page_width_required"] = "The default barcode page width is a required field";
-$lang["config_default_barcode_quality_number"] = "The default barcode quality must be a number";
-$lang["config_default_barcode_quality_required"] = "The default barcode quality is a required field";
-$lang["config_default_barcode_width_number"] = "The default barcode width must be a number";
-$lang["config_default_barcode_width_required"] = "The default barcode width is a required field";
+$lang["config_default_barcode_font_size_number"] = "Default Barcode Font Size must be a number";
+$lang["config_default_barcode_font_size_required"] = "Default Barcode Font Size is a required field";
+$lang["config_default_barcode_height_number"] = "Default Barcode Height must be a number";
+$lang["config_default_barcode_height_required"] = "Default Barcode Height is a required field";
+$lang["config_default_barcode_num_in_row_number"] = "Default Barcode Number in Row must be a number";
+$lang["config_default_barcode_num_in_row_required"] = "Default Barcode Number in Row is a required field";
+$lang["config_default_barcode_page_cellspacing_number"] = "Default Barcode Page Cellspacing must be a number";
+$lang["config_default_barcode_page_cellspacing_required"] = "Default Barcode Page Cellspacing is a required field";
+$lang["config_default_barcode_page_width_number"] = "Default Barcode Page Width must be a number";
+$lang["config_default_barcode_page_width_required"] = "Default Barcode Page Width is a required field";
+$lang["config_default_barcode_quality_number"] = "Default Barcode Quality must be a number";
+$lang["config_default_barcode_quality_required"] = "Default Barcode Quality is a required field";
+$lang["config_default_barcode_width_number"] = "Default Barcode Width must be a number";
+$lang["config_default_barcode_width_required"] = "Default Barcode Width is a required field";
 $lang["config_default_origin_tax_code"] = "Default Origin Tax Code";
 $lang["config_default_sales_discount"] = "Default Sales Discount %";
-$lang["config_default_sales_discount_number"] = "The default sales discount must be a number";
-$lang["config_default_sales_discount_required"] = "The default sales discount is a required field";
-$lang["config_default_tax_name_number"] = "The default tax name must be a string";
-$lang["config_default_tax_name_required"] = "The default tax name is a required field";
+$lang["config_default_sales_discount_number"] = "Default Sales Discount must be a number";
+$lang["config_default_sales_discount_required"] = "Default Sales Discount is a required field";
+$lang["config_default_tax_name_number"] = "Default Tax Name must be a string";
+$lang["config_default_tax_name_required"] = "Default Tax Name is a required field";
 $lang["config_default_tax_rate"] = "Default Tax Rate %";
 $lang["config_default_tax_rate_1"] = "Tax 1 Rate";
 $lang["config_default_tax_rate_2"] = "Tax 2 Rate";
-$lang["config_default_tax_rate_number"] = "The default tax rate must be a number";
-$lang["config_default_tax_rate_required"] = "The default tax rate is a required field";
+$lang["config_default_tax_rate_number"] = "Default Tax Rate must be a number";
+$lang["config_default_tax_rate_required"] = "Default Tax Rate is a required field";
 $lang["config_dinner_table"] = "Table";
-$lang["config_dinner_table_duplicate"] = "Please use an unique table name";
+$lang["config_dinner_table_duplicate"] = "Please use a unique table name";
 $lang["config_dinner_table_enable"] = "Enable Dinner Tables";
-$lang["config_dinner_table_invalid_chars"] = "The table name can not contain '_'";
+$lang["config_dinner_table_invalid_chars"] = "Table Name can not contain '_'";
 $lang["config_dinner_table_required"] = "Table is a required field";
 $lang["config_dot"] = "dot";
 $lang["config_email"] = "Email";
@@ -138,20 +138,20 @@ $lang["config_invoice_default_comments"] = "Default Invoice Comments";
 $lang["config_invoice_email_message"] = "Invoice Email Template";
 $lang["config_invoice_enable"] = "Enable Invoicing";
 $lang["config_invoice_printer"] = "Invoice Printer";
-$lang["config_jsprintsetup_required"] = "Warning! This disabled functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?";
+$lang["config_jsprintsetup_required"] = "Warning! This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?";
 $lang["config_language"] = "Language";
-$lang["config_last_used_invoice_number"] = "Last Used Invoice Number";
-$lang["config_last_used_quote_number"] = "Last Used Quote Number";
+$lang["config_last_used_invoice_number"] = "Last used Invoice Number";
+$lang["config_last_used_quote_number"] = "Last used Quote Number";
 $lang["config_left"] = "Left";
 $lang["config_license"] = "License";
 $lang["config_license_configuration"] = "License Statement";
 $lang["config_line_sequence"] = "Line Sequence";
-$lang["config_lines_per_page"] = "Lines Per Page";
+$lang["config_lines_per_page"] = "Lines per Page";
 $lang["config_lines_per_page_number"] = "";
-$lang["config_lines_per_page_required"] = "The lines per page is a required field";
-$lang["config_locale"] = "Localisation";
-$lang["config_locale_configuration"] = "Localisation Configuration";
-$lang["config_locale_info"] = "Localisation Configuration Information";
+$lang["config_lines_per_page_required"] = "Lines per Page is a required field";
+$lang["config_locale"] = "Localization";
+$lang["config_locale_configuration"] = "Localization Configuration";
+$lang["config_locale_info"] = "Localization Configuration Information";
 $lang["config_location"] = "Stock";
 $lang["config_location_configuration"] = "Stock Locations";
 $lang["config_location_info"] = "Location Configuration Information";
@@ -176,35 +176,35 @@ $lang["config_msg_uid_required"] = "SMS-API Username is a required field";
 $lang["config_none"] = "none";
 $lang["config_notify_alignment"] = "Notification Popup Position";
 $lang["config_number_format"] = "Number Format";
-$lang["config_number_locale"] = "Localisation";
-$lang["config_number_locale_invalid"] = "The entered locale is invalid. Check the link in the tooltip to find a sensible value";
+$lang["config_number_locale"] = "Localization";
+$lang["config_number_locale_invalid"] = "The entered locale is invalid. Check the link in the tooltip to find a valid locale";
 $lang["config_number_locale_required"] = "Number Locale is a required field";
 $lang["config_number_locale_tooltip"] = "Find a suitable locale through this link";
 $lang["config_payment_options_order"] = "Payment Options Order";
 $lang["config_phone"] = "Company Phone";
-$lang["config_phone_required"] = "Company phone is a required field";
+$lang["config_phone_required"] = "Company Phone is a required field";
 $lang["config_print_bottom_margin"] = "Margin Bottom";
-$lang["config_print_bottom_margin_number"] = "The default bottom margin must be a number";
-$lang["config_print_bottom_margin_required"] = "The default bottom margin is a required field";
+$lang["config_print_bottom_margin_number"] = "Margin Bottom must be a number";
+$lang["config_print_bottom_margin_required"] = "Margin Bottom is a required field";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_left_margin"] = "Margin Left";
-$lang["config_print_left_margin_number"] = "The default left margin must be a number";
-$lang["config_print_left_margin_required"] = "The default left margin is a required field";
+$lang["config_print_left_margin_number"] = "Margin Left must be a number";
+$lang["config_print_left_margin_required"] = "Margin Left is a required field";
 $lang["config_print_right_margin"] = "Margin Right";
-$lang["config_print_right_margin_number"] = "The default right margin must be a number";
-$lang["config_print_right_margin_required"] = "The default right margin is a required field";
+$lang["config_print_right_margin_number"] = "Margin Right must be a number";
+$lang["config_print_right_margin_required"] = "Margin Right is a required field";
 $lang["config_print_silently"] = "Show Print Dialog";
 $lang["config_print_top_margin"] = "Margin Top";
-$lang["config_print_top_margin_number"] = "The default top margin must be a number";
-$lang["config_print_top_margin_required"] = "The default top margin is a required field";
+$lang["config_print_top_margin_number"] = "Margin Top must be a number";
+$lang["config_print_top_margin_required"] = "Margin Top is a required field";
 $lang["config_quantity_decimals"] = "Quantity Decimals";
 $lang["config_receipt"] = "Receipt";
 $lang["config_receipt_configuration"] = "Receipt Print Settings";
 $lang["config_receipt_default"] = "Default";
 $lang["config_receipt_font_size"] = "Font Size";
-$lang["config_receipt_font_size_number"] = "The font size must be a number";
-$lang["config_receipt_font_size_required"] = "The font size is a required field";
+$lang["config_receipt_font_size_number"] = "Font Size must be a number";
+$lang["config_receipt_font_size_required"] = "Font Size is a required field";
 $lang["config_receipt_info"] = "Receipt Configuration Information";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_short"] = "Short";
@@ -228,12 +228,12 @@ $lang["config_saved_unsuccessfully"] = "Configuration saved unsuccessfully";
 $lang["config_statistics"] = "Send Statistics";
 $lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes";
 $lang["config_stock_location"] = "Stock location";
-$lang["config_stock_location_duplicate"] = "Please use an unique location name";
-$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
+$lang["config_stock_location_duplicate"] = "Stock Location must be unique";
+$lang["config_stock_location_invalid_chars"] = "Stock Location can not contain '_'";
 $lang["config_stock_location_required"] = "Stock location is a required field";
 $lang["config_table"] = "Table";
 $lang["config_table_configuration"] = "Table Configuration";
-$lang["config_takings_printer"] = "Takings Printer";
+$lang["config_takings_printer"] = "Receipt Printer";
 $lang["config_tax"] = "Tax";
 $lang["config_tax_category"] = "Tax Category";
 $lang["config_tax_category_used"] = "Tax category cannot be deleted because it is being used.";

From 60fc671a9d0d02b218f44b3bf0759319c826bdd4 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Wed, 6 Sep 2017 09:10:09 +0400
Subject: [PATCH 03/27] #1546 Updates

---
 application/language/en-US/customers_lang.php | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/language/en-US/customers_lang.php b/application/language/en-US/customers_lang.php
index 7d863fedc..3711f10c3 100644
--- a/application/language/en-US/customers_lang.php
+++ b/application/language/en-US/customers_lang.php
@@ -1,23 +1,23 @@
 <?php 
 
 $lang["customers_account_number"] = "Account #";
-$lang["customers_account_number_duplicate"] = "This account number is already present in the database";
+$lang["customers_account_number_duplicate"] = "Account Number is already present in the database";
 $lang["customers_available_points"] = "Available Points";
 $lang["customers_average"] = "Average spent";
 $lang["customers_avg_discount"] = "Average discount";
 $lang["customers_basic_information"] = "Information";
-$lang["customers_cannot_be_deleted"] = "Could not deleted selected customers, one or more of the selected customers has sales.";
+$lang["customers_cannot_be_deleted"] = "Could not delete selected customers, one or more of the selected customers has sales.";
 $lang["customers_company_name"] = "Company";
 $lang["customers_confirm_delete"] = "Are you sure you want to delete the selected customers?";
 $lang["customers_customer"] = "Customer";
 $lang["customers_discount"] = "Discount";
-$lang["customers_email_duplicate"] = "The email address is already present in the database";
+$lang["customers_email_duplicate"] = "Email Address is already present in the database";
 $lang["customers_error_adding_updating"] = "Error adding/updating customer";
 $lang["customers_excel_import_failed"] = "Excel import failed";
-$lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or wrong format";
-$lang["customers_excel_import_partially_failed"] = "Most Customers imported. But some were not, here is the list";
-$lang["customers_excel_import_success"] = "Import of Customers successful";
-$lang["customers_import_items_excel"] = "Import customers from Excel sheet";
+$lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or incorrectly formatted";
+$lang["customers_excel_import_partially_failed"] = "Customer import successful with some failures";
+$lang["customers_excel_import_success"] = "Customer Import successful";
+$lang["customers_import_items_excel"] = "Customer Import from Excel";
 $lang["customers_mailchimp_activity_click"] = "Email click";
 $lang["customers_mailchimp_activity_lastopen"] = "Last open email";
 $lang["customers_mailchimp_activity_open"] = "Email open";
@@ -28,10 +28,10 @@ $lang["customers_mailchimp_info"] = "Mailchimp";
 $lang["customers_mailchimp_member_rating"] = "Rating";
 $lang["customers_mailchimp_status"] = "Status";
 $lang["customers_mailchimp_vip"] = "VIP";
-$lang["customers_max"] = "Max spent";
-$lang["customers_min"] = "Min spent";
+$lang["customers_max"] = "Max. spent";
+$lang["customers_min"] = "Min. spent";
 $lang["customers_new"] = "New Customer";
-$lang["customers_none_selected"] = "You have not selected any customers to delete";
+$lang["customers_none_selected"] = "You have not selected customers to delete";
 $lang["customers_one_or_multiple"] = "customer(s)";
 $lang["customers_quantity"] = "Quantity";
 $lang["customers_stats_info"] = "Stats";

From 040f4711d108458401b19b74764677a633549c98 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Wed, 6 Sep 2017 09:11:22 +0400
Subject: [PATCH 04/27] #1546 Updates

---
 application/language/en-US/datepicker_lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/language/en-US/datepicker_lang.php b/application/language/en-US/datepicker_lang.php
index 53694c65c..5ec043c92 100644
--- a/application/language/en-US/datepicker_lang.php
+++ b/application/language/en-US/datepicker_lang.php
@@ -7,12 +7,12 @@ $lang["datepicker_custom"] = "Custom";
 $lang["datepicker_from"] = "From";
 $lang["datepicker_last_30"] = "Last 30 Days";
 $lang["datepicker_last_7"] = "Last 7 Days";
-$lang["datepicker_last_financial_year"] = "Last Financial Year";
+$lang["datepicker_last_financial_year"] = "Last Fiscal Year";
 $lang["datepicker_last_month"] = "Last Month";
 $lang["datepicker_last_year"] = "Last Year";
 $lang["datepicker_same_month_last_year"] = "Same Month Last Year";
 $lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
-$lang["datepicker_this_financial_year"] = "This Financial Year";
+$lang["datepicker_this_financial_year"] = "This Fiscal Year";
 $lang["datepicker_this_month"] = "This Month";
 $lang["datepicker_this_year"] = "This Year";
 $lang["datepicker_to"] = "To";

From 51db8d5b916451695ba696244a75f15a2689e8ea Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Wed, 6 Sep 2017 09:35:31 +0400
Subject: [PATCH 05/27] #1546 Updates

---
 application/language/en-US/employees_lang.php | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/application/language/en-US/employees_lang.php b/application/language/en-US/employees_lang.php
index 204712278..c5282c4e9 100644
--- a/application/language/en-US/employees_lang.php
+++ b/application/language/en-US/employees_lang.php
@@ -1,34 +1,34 @@
 <?php 
 
 $lang["employees_basic_information"] = "Information";
-$lang["employees_cannot_be_deleted"] = "Could not deleted selected employees, one or more of the employees has processed sales or you are trying to delete yourself :)";
+$lang["employees_cannot_be_deleted"] = "Unable to delete selected employees, one or more of the has processed sales or you are trying to delete your account.";
 $lang["employees_change_password"] = "Change Password";
-$lang["employees_confirm_delete"] = "Are you sure you want to delete the selected employees?";
+$lang["employees_confirm_delete"] = "Are you sure you want to delete the selected employee(s)?";
 $lang["employees_current_password"] = "Current Password";
-$lang["employees_current_password_invalid"] = "Invalid Current Password";
+$lang["employees_current_password_invalid"] = "Invalid Current Password.";
 $lang["employees_employee"] = "Employee";
-$lang["employees_error_adding_updating"] = "Error adding/updating employee";
-$lang["employees_error_deleting_demo_admin"] = "You can not delete the demo admin user";
-$lang["employees_error_updating_demo_admin"] = "You can not change the demo admin user";
+$lang["employees_error_adding_updating"] = "Adding/updating Employee failed.";
+$lang["employees_error_deleting_demo_admin"] = "You can not delete the demo admin user.";
+$lang["employees_error_updating_demo_admin"] = "You can not change the demo admin user.";
 $lang["employees_login_info"] = "Login";
 $lang["employees_new"] = "New Employee";
-$lang["employees_none_selected"] = "You have not selected any employees to delete";
+$lang["employees_none_selected"] = "You have not selected any employee(s) to delete.";
 $lang["employees_one_or_multiple"] = "employee(s)";
 $lang["employees_password"] = "Password";
-$lang["employees_password_minlength"] = "Passwords must be at least 8 characters";
-$lang["employees_password_must_match"] = "Passwords do not match";
-$lang["employees_password_not_must_match"] = "Current password and new password should not be the same";
-$lang["employees_password_required"] = "Password is required";
-$lang["employees_permission_desc"] = "Check the boxes below to grant access to modules";
+$lang["employees_password_minlength"] = "Passwords must be at least 8 characters in length.";
+$lang["employees_password_must_match"] = "Passwords do not match.";
+$lang["employees_password_not_must_match"] = "Current password and new password should not be the same.";
+$lang["employees_password_required"] = "Password is required.";
+$lang["employees_permission_desc"] = "Check the boxes below to grant access to modules.";
 $lang["employees_permission_info"] = "Permissions";
 $lang["employees_repeat_password"] = "Password Again";
-$lang["employees_subpermission_required"] = "Add at least one grant for each module";
-$lang["employees_successful_adding"] = "You have successfully added employee";
-$lang["employees_successful_change_password"] = "Password successfully changed";
+$lang["employees_subpermission_required"] = "Add at least one grant for each module.";
+$lang["employees_successful_adding"] = "Employee add successful.";
+$lang["employees_successful_change_password"] = "Password change successful.";
 $lang["employees_successful_deleted"] = "You have successfully deleted";
 $lang["employees_successful_updating"] = "You have successfully updated employee";
-$lang["employees_unsuccessful_change_password"] = "Password unsuccessfully changed";
+$lang["employees_unsuccessful_change_password"] = "Password change failed.";
 $lang["employees_update"] = "Update Employee";
 $lang["employees_username"] = "Username";
-$lang["employees_username_minlength"] = "The username must be at least 5 characters";
-$lang["employees_username_required"] = "Username is a required field";
+$lang["employees_username_minlength"] = "Username must be at least 5 characters in length.";
+$lang["employees_username_required"] = "Username is a required field.";

From 6f9a15f464185f4dda1956213bae816eb7efad43 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Wed, 6 Sep 2017 09:37:39 +0400
Subject: [PATCH 06/27] #1546 Updates

---
 application/language/en-US/common_lang.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/language/en-US/common_lang.php b/application/language/en-US/common_lang.php
index 07aaa384d..42a05e5ec 100644
--- a/application/language/en-US/common_lang.php
+++ b/application/language/en-US/common_lang.php
@@ -14,7 +14,7 @@ $lang["common_det"] = "details";
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
 $lang["common_edit"] = "edit";
 $lang["common_email"] = "Email";
-$lang["common_email_invalid_format"] = "The email address is not in the correct format";
+$lang["common_email_invalid_format"] = "The email address is not in the correct format.";
 $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_no"] = "No";
 $lang["common_export_excel_yes"] = "Yes";
@@ -34,14 +34,14 @@ $lang["common_import_remove_file"] = "Remove";
 $lang["common_import_select_file"] = "Select file";
 $lang["common_inv"] = "inv";
 $lang["common_last_name"] = "Last Name";
-$lang["common_last_name_required"] = "Last Name is a required field";
+$lang["common_last_name_required"] = "Last Name is a required field.";
 $lang["common_last_page"] = "Last";
-$lang["common_learn_about_project"] = "to learn the latest information about the project";
+$lang["common_learn_about_project"] = "to learn the latest information about the project.";
 $lang["common_list_of"] = "List of";
 $lang["common_logout"] = "Logout";
 $lang["common_new"] = "New";
-$lang["common_no_persons_to_display"] = "There are no people to display";
-$lang["common_none_selected_text"] = "Nothing selected";
+$lang["common_no_persons_to_display"] = "There are no people to display.";
+$lang["common_none_selected_text"] = "Nothing selected.";
 $lang["common_or"] = "OR";
 $lang["common_phone_number"] = "Phone Number";
 $lang["common_phone_number_required"] = "";
@@ -62,6 +62,6 @@ $lang["common_unknown"] = "Unknown";
 $lang["common_view_recent_sales"] = "View Recent Sales";
 $lang["common_website"] = "website";
 $lang["common_welcome"] = "Welcome";
-$lang["common_welcome_message"] = "Welcome to OSPOS, click a module below to get started";
+$lang["common_welcome_message"] = "Welcome to OSPOS, click a module below to get started.";
 $lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale version";
 $lang["common_zip"] = "Postal Code";

From 2499bc50152eac77ee1f5df0d65de98027ee68a0 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Wed, 6 Sep 2017 09:46:49 +0400
Subject: [PATCH 07/27] #1546 Updates

---
 application/language/en-US/config_lang.php | 114 ++++++++++-----------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/application/language/en-US/config_lang.php b/application/language/en-US/config_lang.php
index bdd8fe0df..558dfc859 100644
--- a/application/language/en-US/config_lang.php
+++ b/application/language/en-US/config_lang.php
@@ -1,7 +1,7 @@
 <?php 
 
 $lang["config_address"] = "Company Address";
-$lang["config_address_required"] = "Company address is a required field";
+$lang["config_address_required"] = "Company address is a required field.";
 $lang["config_apostrophe"] = "apostrophe";
 $lang["config_backup_button"] = "Backup";
 $lang["config_backup_database"] = "Backup Database";
@@ -12,7 +12,7 @@ $lang["config_barcode_content"] = "Barcode Content";
 $lang["config_barcode_first_row"] = "Row 1";
 $lang["config_barcode_font"] = "Font";
 $lang["config_barcode_formats"] = "Input Formats";
-$lang["config_barcode_generate_if_empty"] = "Generate if empty";
+$lang["config_barcode_generate_if_empty"] = "Generate if empty.";
 $lang["config_barcode_height"] = "Height (px)";
 $lang["config_barcode_id"] = "Item Id/Name";
 $lang["config_barcode_info"] = "Barcode Configuration Information";
@@ -20,7 +20,7 @@ $lang["config_barcode_layout"] = "Barcode Layout";
 $lang["config_barcode_name"] = "Name";
 $lang["config_barcode_number"] = "Barcode";
 $lang["config_barcode_number_in_row"] = "Number in row";
-$lang["config_barcode_page_cellspacing"] = "Display page cellspacing";
+$lang["config_barcode_page_cellspacing"] = "Display page cellspacing.";
 $lang["config_barcode_page_width"] = "Display page width";
 $lang["config_barcode_price"] = "Price";
 $lang["config_barcode_quality"] = "Quality (1-100)";
@@ -40,7 +40,7 @@ $lang["config_company_logo"] = "Company Logo";
 $lang["config_company_remove_image"] = "Remove Image";
 $lang["config_company_required"] = "Company name is a required field";
 $lang["config_company_select_image"] = "Select Image";
-$lang["config_company_website_url"] = "Company website is not a valid URL (http://...)";
+$lang["config_company_website_url"] = "Company website is not a valid URL (http://...).";
 $lang["config_country_codes"] = "Country Codes";
 $lang["config_country_codes_tooltip"] = "Comma separated list of country codes for nominatim address lookup.";
 $lang["config_currency_decimals"] = "Currency Decimals";
@@ -56,44 +56,44 @@ $lang["config_custom7"] = "Custom Field 7";
 $lang["config_custom8"] = "Custom Field 8";
 $lang["config_custom9"] = "Custom Field 9";
 $lang["config_customer_reward"] = "Reward";
-$lang["config_customer_reward_duplicate"] = "Please use a unique reward name";
+$lang["config_customer_reward_duplicate"] = "Reward must be unique.";
 $lang["config_customer_reward_enable"] = "Enable Customer Rewards";
-$lang["config_customer_reward_invalid_chars"] = "Reward Name can not contain '_'";
+$lang["config_customer_reward_invalid_chars"] = "Reward can not contain '_'";
 $lang["config_customer_reward_required"] = "Reward is a required field";
 $lang["config_customer_sales_tax_support"] = "Customer Sales Tax Support";
 $lang["config_date_or_time_format"] = "Date and Time Filter";
 $lang["config_datetimeformat"] = "Date and Time Format";
 $lang["config_decimal_point"] = "Decimal Point";
-$lang["config_default_barcode_font_size_number"] = "Default Barcode Font Size must be a number";
-$lang["config_default_barcode_font_size_required"] = "Default Barcode Font Size is a required field";
-$lang["config_default_barcode_height_number"] = "Default Barcode Height must be a number";
-$lang["config_default_barcode_height_required"] = "Default Barcode Height is a required field";
-$lang["config_default_barcode_num_in_row_number"] = "Default Barcode Number in Row must be a number";
-$lang["config_default_barcode_num_in_row_required"] = "Default Barcode Number in Row is a required field";
-$lang["config_default_barcode_page_cellspacing_number"] = "Default Barcode Page Cellspacing must be a number";
-$lang["config_default_barcode_page_cellspacing_required"] = "Default Barcode Page Cellspacing is a required field";
-$lang["config_default_barcode_page_width_number"] = "Default Barcode Page Width must be a number";
-$lang["config_default_barcode_page_width_required"] = "Default Barcode Page Width is a required field";
-$lang["config_default_barcode_quality_number"] = "Default Barcode Quality must be a number";
-$lang["config_default_barcode_quality_required"] = "Default Barcode Quality is a required field";
-$lang["config_default_barcode_width_number"] = "Default Barcode Width must be a number";
-$lang["config_default_barcode_width_required"] = "Default Barcode Width is a required field";
+$lang["config_default_barcode_font_size_number"] = "Default Barcode Font Size must be a number.";
+$lang["config_default_barcode_font_size_required"] = "Default Barcode Font Size is a required field.";
+$lang["config_default_barcode_height_number"] = "Default Barcode Height must be a number.";
+$lang["config_default_barcode_height_required"] = "Default Barcode Height is a required field.";
+$lang["config_default_barcode_num_in_row_number"] = "Default Barcode Number in Row must be a number.";
+$lang["config_default_barcode_num_in_row_required"] = "Default Barcode Number in Row is a required field.";
+$lang["config_default_barcode_page_cellspacing_number"] = "Default Barcode Page Cellspacing must be a number.";
+$lang["config_default_barcode_page_cellspacing_required"] = "Default Barcode Page Cellspacing is a required field.";
+$lang["config_default_barcode_page_width_number"] = "Default Barcode Page Width must be a number.";
+$lang["config_default_barcode_page_width_required"] = "Default Barcode Page Width is a required field.";
+$lang["config_default_barcode_quality_number"] = "Default Barcode Quality must be a number.";
+$lang["config_default_barcode_quality_required"] = "Default Barcode Quality is a required field.";
+$lang["config_default_barcode_width_number"] = "Default Barcode Width must be a number.";
+$lang["config_default_barcode_width_required"] = "Default Barcode Width is a required field.";
 $lang["config_default_origin_tax_code"] = "Default Origin Tax Code";
 $lang["config_default_sales_discount"] = "Default Sales Discount %";
-$lang["config_default_sales_discount_number"] = "Default Sales Discount must be a number";
-$lang["config_default_sales_discount_required"] = "Default Sales Discount is a required field";
-$lang["config_default_tax_name_number"] = "Default Tax Name must be a string";
-$lang["config_default_tax_name_required"] = "Default Tax Name is a required field";
+$lang["config_default_sales_discount_number"] = "Default Sales Discount must be a number.";
+$lang["config_default_sales_discount_required"] = "Default Sales Discount is a required field.";
+$lang["config_default_tax_name_number"] = "Default Tax Name must be a string.";
+$lang["config_default_tax_name_required"] = "Default Tax Name is a required field.";
 $lang["config_default_tax_rate"] = "Default Tax Rate %";
 $lang["config_default_tax_rate_1"] = "Tax 1 Rate";
 $lang["config_default_tax_rate_2"] = "Tax 2 Rate";
-$lang["config_default_tax_rate_number"] = "Default Tax Rate must be a number";
-$lang["config_default_tax_rate_required"] = "Default Tax Rate is a required field";
+$lang["config_default_tax_rate_number"] = "Default Tax Rate must be a number.";
+$lang["config_default_tax_rate_required"] = "Default Tax Rate is a required field.";
 $lang["config_dinner_table"] = "Table";
-$lang["config_dinner_table_duplicate"] = "Please use a unique table name";
+$lang["config_dinner_table_duplicate"] = "Table must be unique.";
 $lang["config_dinner_table_enable"] = "Enable Dinner Tables";
-$lang["config_dinner_table_invalid_chars"] = "Table Name can not contain '_'";
-$lang["config_dinner_table_required"] = "Table is a required field";
+$lang["config_dinner_table_invalid_chars"] = "Table Name can not contain '_'.";
+$lang["config_dinner_table_required"] = "Table is a required field.";
 $lang["config_dot"] = "dot";
 $lang["config_email"] = "Email";
 $lang["config_email_configuration"] = "Email Configuration";
@@ -106,7 +106,7 @@ $lang["config_email_smtp_port"] = "SMTP Port";
 $lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
 $lang["config_email_smtp_user"] = "SMTP Username";
 $lang["config_fax"] = "Fax";
-$lang["config_financial_year"] = "Financial Year Start";
+$lang["config_financial_year"] = "Fiscal Year Start";
 $lang["config_financial_year_apr"] = "1st of April";
 $lang["config_financial_year_aug"] = "1st of August";
 $lang["config_financial_year_dec"] = "1st of December";
@@ -124,7 +124,7 @@ $lang["config_gcaptcha_secret_key"] = "reCAPTCHA Secret Key";
 $lang["config_gcaptcha_secret_key_required"] = "reCAPTCHA Secret Key is a required field";
 $lang["config_gcaptcha_site_key"] = "reCAPTCHA Site Key";
 $lang["config_gcaptcha_site_key_required"] = "reCAPTCHA Site Key is a required field";
-$lang["config_gcaptcha_tooltip"] = "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair";
+$lang["config_gcaptcha_tooltip"] = "Protect the Login page with Google reCAPTCHA, click the icon for an API key pair.";
 $lang["config_general"] = "General";
 $lang["config_general_configuration"] = "General Configuration";
 $lang["config_giftcard_number"] = "Gift Card Number";
@@ -148,21 +148,21 @@ $lang["config_license_configuration"] = "License Statement";
 $lang["config_line_sequence"] = "Line Sequence";
 $lang["config_lines_per_page"] = "Lines per Page";
 $lang["config_lines_per_page_number"] = "";
-$lang["config_lines_per_page_required"] = "Lines per Page is a required field";
+$lang["config_lines_per_page_required"] = "Lines per Page is a required field.";
 $lang["config_locale"] = "Localization";
 $lang["config_locale_configuration"] = "Localization Configuration";
 $lang["config_locale_info"] = "Localization Configuration Information";
 $lang["config_location"] = "Stock";
 $lang["config_location_configuration"] = "Stock Locations";
 $lang["config_location_info"] = "Location Configuration Information";
-$lang["config_logout"] = "Don't you want to make a backup before logging out? Click [OK] to backup, [Cancel] to logout";
+$lang["config_logout"] = "Don't you want to make a backup before logging out? Click [OK] to backup, [Cancel] to logout.";
 $lang["config_mailchimp"] = "Mailchimp";
 $lang["config_mailchimp_api_key"] = "Mailchimp API Key";
 $lang["config_mailchimp_configuration"] = "Mailchimp Configuration";
-$lang["config_mailchimp_key_successfully"] = "Valid API Key";
-$lang["config_mailchimp_key_unsuccessfully"] = "Invalid API Key";
+$lang["config_mailchimp_key_successfully"] = "API Key is valid.";
+$lang["config_mailchimp_key_unsuccessfully"] = "API Key is invalid.";
 $lang["config_mailchimp_lists"] = "Mailchimp List(s)";
-$lang["config_mailchimp_tooltip"] = "Click the icon for an API key";
+$lang["config_mailchimp_tooltip"] = "Click the icon for an API Key.";
 $lang["config_message"] = "Message";
 $lang["config_message_configuration"] = "Message Configuration";
 $lang["config_msg_msg"] = "Saved Text Message";
@@ -177,34 +177,34 @@ $lang["config_none"] = "none";
 $lang["config_notify_alignment"] = "Notification Popup Position";
 $lang["config_number_format"] = "Number Format";
 $lang["config_number_locale"] = "Localization";
-$lang["config_number_locale_invalid"] = "The entered locale is invalid. Check the link in the tooltip to find a valid locale";
-$lang["config_number_locale_required"] = "Number Locale is a required field";
-$lang["config_number_locale_tooltip"] = "Find a suitable locale through this link";
+$lang["config_number_locale_invalid"] = "The entered locale is invalid. Check the link in the tooltip to find a valid locale.";
+$lang["config_number_locale_required"] = "Number Locale is a required field.";
+$lang["config_number_locale_tooltip"] = "Find a suitable locale through this link.";
 $lang["config_payment_options_order"] = "Payment Options Order";
 $lang["config_phone"] = "Company Phone";
-$lang["config_phone_required"] = "Company Phone is a required field";
+$lang["config_phone_required"] = "Company Phone is a required field.";
 $lang["config_print_bottom_margin"] = "Margin Bottom";
-$lang["config_print_bottom_margin_number"] = "Margin Bottom must be a number";
-$lang["config_print_bottom_margin_required"] = "Margin Bottom is a required field";
+$lang["config_print_bottom_margin_number"] = "Margin Bottom must be a number.";
+$lang["config_print_bottom_margin_required"] = "Margin Bottom is a required field.";
 $lang["config_print_footer"] = "Print Browser Footer";
 $lang["config_print_header"] = "Print Browser Header";
 $lang["config_print_left_margin"] = "Margin Left";
-$lang["config_print_left_margin_number"] = "Margin Left must be a number";
-$lang["config_print_left_margin_required"] = "Margin Left is a required field";
+$lang["config_print_left_margin_number"] = "Margin Left must be a number.";
+$lang["config_print_left_margin_required"] = "Margin Left is a required field.";
 $lang["config_print_right_margin"] = "Margin Right";
-$lang["config_print_right_margin_number"] = "Margin Right must be a number";
-$lang["config_print_right_margin_required"] = "Margin Right is a required field";
+$lang["config_print_right_margin_number"] = "Margin Right must be a number.";
+$lang["config_print_right_margin_required"] = "Margin Right is a required field.";
 $lang["config_print_silently"] = "Show Print Dialog";
 $lang["config_print_top_margin"] = "Margin Top";
-$lang["config_print_top_margin_number"] = "Margin Top must be a number";
-$lang["config_print_top_margin_required"] = "Margin Top is a required field";
+$lang["config_print_top_margin_number"] = "Margin Top must be a number.";
+$lang["config_print_top_margin_required"] = "Margin Top is a required field.";
 $lang["config_quantity_decimals"] = "Quantity Decimals";
 $lang["config_receipt"] = "Receipt";
 $lang["config_receipt_configuration"] = "Receipt Print Settings";
 $lang["config_receipt_default"] = "Default";
 $lang["config_receipt_font_size"] = "Font Size";
-$lang["config_receipt_font_size_number"] = "Font Size must be a number";
-$lang["config_receipt_font_size_required"] = "Font Size is a required field";
+$lang["config_receipt_font_size_number"] = "Font Size must be a number.";
+$lang["config_receipt_font_size_required"] = "Font Size is a required field.";
 $lang["config_receipt_info"] = "Receipt Configuration Information";
 $lang["config_receipt_printer"] = "Ticket Printer";
 $lang["config_receipt_short"] = "Short";
@@ -217,20 +217,20 @@ $lang["config_receipt_template"] = "Receipt Template";
 $lang["config_receiving_calculate_average_price"] = "Calc avg. Price (Receiving)";
 $lang["config_recv_invoice_format"] = "Receivings Invoice Format";
 $lang["config_register_mode_default"] = "Default Register Mode";
-$lang["config_return_policy_required"] = "Return policy is a required field";
+$lang["config_return_policy_required"] = "Return policy is a required field.";
 $lang["config_reward"] = "Reward";
 $lang["config_reward_configuration"] = "Reward Configuration";
 $lang["config_right"] = "Right";
 $lang["config_sales_invoice_format"] = "Sales Invoice Format";
 $lang["config_sales_quote_format"] = "Sales Quote Format";
-$lang["config_saved_successfully"] = "Configuration saved successfully";
-$lang["config_saved_unsuccessfully"] = "Configuration saved unsuccessfully";
+$lang["config_saved_successfully"] = "Configuration save successful.";
+$lang["config_saved_unsuccessfully"] = "Configuration save failed.";
 $lang["config_statistics"] = "Send Statistics";
-$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes";
+$lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes.";
 $lang["config_stock_location"] = "Stock location";
-$lang["config_stock_location_duplicate"] = "Stock Location must be unique";
-$lang["config_stock_location_invalid_chars"] = "Stock Location can not contain '_'";
-$lang["config_stock_location_required"] = "Stock location is a required field";
+$lang["config_stock_location_duplicate"] = "Stock Location must be unique.";
+$lang["config_stock_location_invalid_chars"] = "Stock Location can not contain '_'.";
+$lang["config_stock_location_required"] = "Stock location is a required field.";
 $lang["config_table"] = "Table";
 $lang["config_table_configuration"] = "Table Configuration";
 $lang["config_takings_printer"] = "Receipt Printer";

From 9aee57da2f1807390ce80c4365d9a06d4c870f9f Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Wed, 6 Sep 2017 09:48:34 +0400
Subject: [PATCH 08/27] #1546 Updates

---
 application/language/en-US/customers_lang.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/language/en-US/customers_lang.php b/application/language/en-US/customers_lang.php
index 3711f10c3..f303c04d4 100644
--- a/application/language/en-US/customers_lang.php
+++ b/application/language/en-US/customers_lang.php
@@ -1,7 +1,7 @@
 <?php 
 
 $lang["customers_account_number"] = "Account #";
-$lang["customers_account_number_duplicate"] = "Account Number is already present in the database";
+$lang["customers_account_number_duplicate"] = "Account Number is already present in the database.";
 $lang["customers_available_points"] = "Available Points";
 $lang["customers_average"] = "Average spent";
 $lang["customers_avg_discount"] = "Average discount";
@@ -11,12 +11,12 @@ $lang["customers_company_name"] = "Company";
 $lang["customers_confirm_delete"] = "Are you sure you want to delete the selected customers?";
 $lang["customers_customer"] = "Customer";
 $lang["customers_discount"] = "Discount";
-$lang["customers_email_duplicate"] = "Email Address is already present in the database";
-$lang["customers_error_adding_updating"] = "Error adding/updating customer";
+$lang["customers_email_duplicate"] = "Email Address is already present in the database.";
+$lang["customers_error_adding_updating"] = "adding/updating Customer failed.";
 $lang["customers_excel_import_failed"] = "Excel import failed";
-$lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or incorrectly formatted";
-$lang["customers_excel_import_partially_failed"] = "Customer import successful with some failures";
-$lang["customers_excel_import_success"] = "Customer Import successful";
+$lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or incorrectly formatted.";
+$lang["customers_excel_import_partially_failed"] = "Customer import successful with some failures.";
+$lang["customers_excel_import_success"] = "Customer Import successful.";
 $lang["customers_import_items_excel"] = "Customer Import from Excel";
 $lang["customers_mailchimp_activity_click"] = "Email click";
 $lang["customers_mailchimp_activity_lastopen"] = "Last open email";
@@ -31,7 +31,7 @@ $lang["customers_mailchimp_vip"] = "VIP";
 $lang["customers_max"] = "Max. spent";
 $lang["customers_min"] = "Min. spent";
 $lang["customers_new"] = "New Customer";
-$lang["customers_none_selected"] = "You have not selected customers to delete";
+$lang["customers_none_selected"] = "You have not selected customer(s) to delete.";
 $lang["customers_one_or_multiple"] = "customer(s)";
 $lang["customers_quantity"] = "Quantity";
 $lang["customers_stats_info"] = "Stats";

From ba2e274cb0ad0296a037d7bb33922d91f802e5fd Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Wed, 6 Sep 2017 10:07:02 +0400
Subject: [PATCH 09/27] #1546 Updates

---
 application/language/en-US/giftcards_lang.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/language/en-US/giftcards_lang.php b/application/language/en-US/giftcards_lang.php
index bdc6656fa..08cbe7702 100644
--- a/application/language/en-US/giftcards_lang.php
+++ b/application/language/en-US/giftcards_lang.php
@@ -4,13 +4,13 @@ $lang["giftcards_add_minus"] = "Inventory to add/subtract";
 $lang["giftcards_allow_alt_description"] = "Allow Alt Description";
 $lang["giftcards_amazon"] = "Amazon";
 $lang["giftcards_bulk_edit"] = "Bulk Edit";
-$lang["giftcards_cannot_be_deleted"] = "Could not deleted selected giftcards, one or more of the selected giftcards has sales.";
-$lang["giftcards_cannot_find_giftcard"] = "Cannot find any information about giftcard";
-$lang["giftcards_cannot_use"] = "Giftcard %1 cannot be used for this sale. Invalid Customer!";
+$lang["giftcards_cannot_be_deleted"] = "Could not deleted selected gift cards, one or more of the selected giftcards has sales.";
+$lang["giftcards_cannot_find_giftcard"] = "Can not find any information about Gift Card";
+$lang["giftcards_cannot_use"] = "Gift Card %1 cannot be used for this sale. Invalid Customer.";
 $lang["giftcards_card_value"] = "Value";
 $lang["giftcards_category"] = "Category";
-$lang["giftcards_change_all_to_allow_alt_desc"] = "Allow Alt Desc For All";
-$lang["giftcards_change_all_to_not_allow_allow_desc"] = "Not Allow Alt Desc For All";
+$lang["giftcards_change_all_to_allow_alt_desc"] = "Allow Alternate Description for all.";
+$lang["giftcards_change_all_to_not_allow_allow_desc"] = "Do not Allow Alter Desc For all.";
 $lang["giftcards_change_all_to_serialized"] = "Change All To Serialized";
 $lang["giftcards_change_all_to_unserialized"] = "Change All To Unserialized";
 $lang["giftcards_confirm_bulk_edit"] = "Are you sure you want to edit all the giftcards selected?";

From 2b7e9cf631c00ada1d4f8c6c7998c5e82e31dea8 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 15:45:46 +0400
Subject: [PATCH 10/27] #1546 Updates

---
 application/language/en-US/customers_lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/language/en-US/customers_lang.php b/application/language/en-US/customers_lang.php
index f303c04d4..9a9d21a66 100644
--- a/application/language/en-US/customers_lang.php
+++ b/application/language/en-US/customers_lang.php
@@ -8,7 +8,7 @@ $lang["customers_avg_discount"] = "Average discount";
 $lang["customers_basic_information"] = "Information";
 $lang["customers_cannot_be_deleted"] = "Could not delete selected customers, one or more of the selected customers has sales.";
 $lang["customers_company_name"] = "Company";
-$lang["customers_confirm_delete"] = "Are you sure you want to delete the selected customers?";
+$lang["customers_confirm_delete"] = "Are you sure you want to delete the selected customer(s)?";
 $lang["customers_customer"] = "Customer";
 $lang["customers_discount"] = "Discount";
 $lang["customers_email_duplicate"] = "Email Address is already present in the database.";
@@ -16,7 +16,7 @@ $lang["customers_error_adding_updating"] = "adding/updating Customer failed.";
 $lang["customers_excel_import_failed"] = "Excel import failed";
 $lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or incorrectly formatted.";
 $lang["customers_excel_import_partially_failed"] = "Customer import successful with some failures.";
-$lang["customers_excel_import_success"] = "Customer Import successful.";
+$lang["customers_excel_import_success"] = "Customer import successful.";
 $lang["customers_import_items_excel"] = "Customer Import from Excel";
 $lang["customers_mailchimp_activity_click"] = "Email click";
 $lang["customers_mailchimp_activity_lastopen"] = "Last open email";
@@ -31,7 +31,7 @@ $lang["customers_mailchimp_vip"] = "VIP";
 $lang["customers_max"] = "Max. spent";
 $lang["customers_min"] = "Min. spent";
 $lang["customers_new"] = "New Customer";
-$lang["customers_none_selected"] = "You have not selected customer(s) to delete.";
+$lang["customers_none_selected"] = "You have not selected any customer(s) to delete.";
 $lang["customers_one_or_multiple"] = "customer(s)";
 $lang["customers_quantity"] = "Quantity";
 $lang["customers_stats_info"] = "Stats";

From c6a519e4adf95bc14c83133912a8affcd0f8f049 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 15:48:56 +0400
Subject: [PATCH 11/27] #1546 Updates

---
 application/language/en-US/employees_lang.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/language/en-US/employees_lang.php b/application/language/en-US/employees_lang.php
index c5282c4e9..444827bb8 100644
--- a/application/language/en-US/employees_lang.php
+++ b/application/language/en-US/employees_lang.php
@@ -1,13 +1,13 @@
 <?php 
 
 $lang["employees_basic_information"] = "Information";
-$lang["employees_cannot_be_deleted"] = "Unable to delete selected employees, one or more of the has processed sales or you are trying to delete your account.";
+$lang["employees_cannot_be_deleted"] = "Unable to delete selected employee(s), one or more of the has processed sales or you are trying to delete your account.";
 $lang["employees_change_password"] = "Change Password";
 $lang["employees_confirm_delete"] = "Are you sure you want to delete the selected employee(s)?";
 $lang["employees_current_password"] = "Current Password";
-$lang["employees_current_password_invalid"] = "Invalid Current Password.";
+$lang["employees_current_password_invalid"] = "Current Password is invalid.";
 $lang["employees_employee"] = "Employee";
-$lang["employees_error_adding_updating"] = "Adding/updating Employee failed.";
+$lang["employees_error_adding_updating"] = "Employee add or update failed.";
 $lang["employees_error_deleting_demo_admin"] = "You can not delete the demo admin user.";
 $lang["employees_error_updating_demo_admin"] = "You can not change the demo admin user.";
 $lang["employees_login_info"] = "Login";
@@ -15,9 +15,9 @@ $lang["employees_new"] = "New Employee";
 $lang["employees_none_selected"] = "You have not selected any employee(s) to delete.";
 $lang["employees_one_or_multiple"] = "employee(s)";
 $lang["employees_password"] = "Password";
-$lang["employees_password_minlength"] = "Passwords must be at least 8 characters in length.";
+$lang["employees_password_minlength"] = "Password must be at least 8 characters in length.";
 $lang["employees_password_must_match"] = "Passwords do not match.";
-$lang["employees_password_not_must_match"] = "Current password and new password should not be the same.";
+$lang["employees_password_not_must_match"] = "Current password and new password can not be the same.";
 $lang["employees_password_required"] = "Password is required.";
 $lang["employees_permission_desc"] = "Check the boxes below to grant access to modules.";
 $lang["employees_permission_info"] = "Permissions";

From e4215df83518a42c79e75f679ddc7a573d050149 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 15:53:23 +0400
Subject: [PATCH 12/27] #1546 Updates

---
 application/language/en-US/config_lang.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/language/en-US/config_lang.php b/application/language/en-US/config_lang.php
index 558dfc859..f106569f9 100644
--- a/application/language/en-US/config_lang.php
+++ b/application/language/en-US/config_lang.php
@@ -30,7 +30,7 @@ $lang["config_barcode_type"] = "Barcode Type";
 $lang["config_barcode_width"] = "Width (px)";
 $lang["config_bottom"] = "Bottom";
 $lang["config_cash_decimals"] = "Cash Decimals";
-$lang["config_cash_decimals_tooltip"] = "If cash decimals and currency decimals are the same then no cash rounding will take place.";
+$lang["config_cash_decimals_tooltip"] = "If Cash Decimals and Currency Decimals are the same then no cash rounding will take place.";
 $lang["config_cash_rounding"] = "Cash Rounding";
 $lang["config_center"] = "Center";
 $lang["config_comma"] = "comma";
@@ -138,7 +138,7 @@ $lang["config_invoice_default_comments"] = "Default Invoice Comments";
 $lang["config_invoice_email_message"] = "Invoice Email Template";
 $lang["config_invoice_enable"] = "Enable Invoicing";
 $lang["config_invoice_printer"] = "Invoice Printer";
-$lang["config_jsprintsetup_required"] = "Warning! This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?";
+$lang["config_jsprintsetup_required"] = "Warning: This functionality will only work if you have the FireFox jsPrintSetup addon installed. Save anyway?";
 $lang["config_language"] = "Language";
 $lang["config_last_used_invoice_number"] = "Last used Invoice Number";
 $lang["config_last_used_quote_number"] = "Last used Quote Number";
@@ -155,7 +155,7 @@ $lang["config_locale_info"] = "Localization Configuration Information";
 $lang["config_location"] = "Stock";
 $lang["config_location_configuration"] = "Stock Locations";
 $lang["config_location_info"] = "Location Configuration Information";
-$lang["config_logout"] = "Don't you want to make a backup before logging out? Click [OK] to backup, [Cancel] to logout.";
+$lang["config_logout"] = "Do you want to make a backup before logging out? Click [OK] to backup or [Cancel] to logout.";
 $lang["config_mailchimp"] = "Mailchimp";
 $lang["config_mailchimp_api_key"] = "Mailchimp API Key";
 $lang["config_mailchimp_configuration"] = "Mailchimp Configuration";
@@ -166,7 +166,7 @@ $lang["config_mailchimp_tooltip"] = "Click the icon for an API Key.";
 $lang["config_message"] = "Message";
 $lang["config_message_configuration"] = "Message Configuration";
 $lang["config_msg_msg"] = "Saved Text Message";
-$lang["config_msg_msg_placeholder"] = "If you wish to use a SMS template save your message here. Otherwise leave the box blank.";
+$lang["config_msg_msg_placeholder"] = "If you wish to use a SMS template save your message here, otherwise leave the box blank.";
 $lang["config_msg_pwd"] = "SMS-API Password";
 $lang["config_msg_pwd_required"] = "SMS-API Password is a required field";
 $lang["config_msg_src"] = "SMS-API Sender ID";

From 4936f1b30202d98b8718bb0d99b17a15b9ec2032 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 15:55:13 +0400
Subject: [PATCH 13/27] #1546 Updates

---
 application/language/en-US/customers_lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/language/en-US/customers_lang.php b/application/language/en-US/customers_lang.php
index 9a9d21a66..275cd7fba 100644
--- a/application/language/en-US/customers_lang.php
+++ b/application/language/en-US/customers_lang.php
@@ -12,10 +12,10 @@ $lang["customers_confirm_delete"] = "Are you sure you want to delete the selecte
 $lang["customers_customer"] = "Customer";
 $lang["customers_discount"] = "Discount";
 $lang["customers_email_duplicate"] = "Email Address is already present in the database.";
-$lang["customers_error_adding_updating"] = "adding/updating Customer failed.";
+$lang["customers_error_adding_updating"] = "Customer add or update failed.";
 $lang["customers_excel_import_failed"] = "Excel import failed";
-$lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or incorrectly formatted.";
-$lang["customers_excel_import_partially_failed"] = "Customer import successful with some failures.";
+$lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or is incorrectly formatted.";
+$lang["customers_excel_import_partially_failed"] = "Customer import successful with some failures:";
 $lang["customers_excel_import_success"] = "Customer import successful.";
 $lang["customers_import_items_excel"] = "Customer Import from Excel";
 $lang["customers_mailchimp_activity_click"] = "Email click";

From 75e0b2898e8d0a5ef83c9dece9ce2fea5a9bbfcf Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 15:56:10 +0400
Subject: [PATCH 14/27] #1546 Updates

---
 application/language/en-US/datepicker_lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/language/en-US/datepicker_lang.php b/application/language/en-US/datepicker_lang.php
index 5ec043c92..095eb96ec 100644
--- a/application/language/en-US/datepicker_lang.php
+++ b/application/language/en-US/datepicker_lang.php
@@ -12,9 +12,9 @@ $lang["datepicker_last_month"] = "Last Month";
 $lang["datepicker_last_year"] = "Last Year";
 $lang["datepicker_same_month_last_year"] = "Same Month Last Year";
 $lang["datepicker_same_month_to_same_day_last_year"] = "Same Month To Same Day Last Year";
-$lang["datepicker_this_financial_year"] = "This Fiscal Year";
-$lang["datepicker_this_month"] = "This Month";
-$lang["datepicker_this_year"] = "This Year";
+$lang["datepicker_this_financial_year"] = "Current Fiscal Year";
+$lang["datepicker_this_month"] = "Current Month";
+$lang["datepicker_this_year"] = "Current Year";
 $lang["datepicker_to"] = "To";
 $lang["datepicker_today"] = "Today";
 $lang["datepicker_today_last_year"] = "Today Last Year";

From cf24aebebce3e3a9d3b37b044ad108e855b9796a Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 15:57:46 +0400
Subject: [PATCH 15/27] #1546 Updates

---
 application/language/en-US/employees_lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/language/en-US/employees_lang.php b/application/language/en-US/employees_lang.php
index 444827bb8..67f685b97 100644
--- a/application/language/en-US/employees_lang.php
+++ b/application/language/en-US/employees_lang.php
@@ -17,7 +17,7 @@ $lang["employees_one_or_multiple"] = "employee(s)";
 $lang["employees_password"] = "Password";
 $lang["employees_password_minlength"] = "Password must be at least 8 characters in length.";
 $lang["employees_password_must_match"] = "Passwords do not match.";
-$lang["employees_password_not_must_match"] = "Current password and new password can not be the same.";
+$lang["employees_password_not_must_match"] = "Current password and new password must be unique.";
 $lang["employees_password_required"] = "Password is required.";
 $lang["employees_permission_desc"] = "Check the boxes below to grant access to modules.";
 $lang["employees_permission_info"] = "Permissions";

From 941e968fdacc632f7895f469b9ec45ad3b7f9c14 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 16:41:01 +0400
Subject: [PATCH 16/27] #1546 Updates

---
 application/language/en-US/giftcards_lang.php | 80 +++++++++----------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/application/language/en-US/giftcards_lang.php b/application/language/en-US/giftcards_lang.php
index 08cbe7702..a8dbf7c4f 100644
--- a/application/language/en-US/giftcards_lang.php
+++ b/application/language/en-US/giftcards_lang.php
@@ -1,70 +1,70 @@
 <?php 
 
-$lang["giftcards_add_minus"] = "Inventory to add/subtract";
-$lang["giftcards_allow_alt_description"] = "Allow Alt Description";
+$lang["giftcards_add_minus"] = "Inventory to add or subtract.";
+$lang["giftcards_allow_alt_description"] = "Allow Alternate Description";
 $lang["giftcards_amazon"] = "Amazon";
 $lang["giftcards_bulk_edit"] = "Bulk Edit";
-$lang["giftcards_cannot_be_deleted"] = "Could not deleted selected gift cards, one or more of the selected giftcards has sales.";
-$lang["giftcards_cannot_find_giftcard"] = "Can not find any information about Gift Card";
-$lang["giftcards_cannot_use"] = "Gift Card %1 cannot be used for this sale. Invalid Customer.";
+$lang["giftcards_cannot_be_deleted"] = "Could not delete selected Gift Card(s), one or more of the selected Gift Cards has sales.";
+$lang["giftcards_cannot_find_giftcard"] = "Gift Card not found.";
+$lang["giftcards_cannot_use"] = "Gift Card %1 cannot be used for this sale: invalid Customer.";
 $lang["giftcards_card_value"] = "Value";
 $lang["giftcards_category"] = "Category";
-$lang["giftcards_change_all_to_allow_alt_desc"] = "Allow Alternate Description for all.";
-$lang["giftcards_change_all_to_not_allow_allow_desc"] = "Do not Allow Alter Desc For all.";
+$lang["giftcards_change_all_to_allow_alt_desc"] = "Allow alternate description for all.";
+$lang["giftcards_change_all_to_not_allow_allow_desc"] = "Do not allow alternate description for all.";
 $lang["giftcards_change_all_to_serialized"] = "Change All To Serialized";
 $lang["giftcards_change_all_to_unserialized"] = "Change All To Unserialized";
-$lang["giftcards_confirm_bulk_edit"] = "Are you sure you want to edit all the giftcards selected?";
-$lang["giftcards_confirm_delete"] = "Are you sure you want to delete the selected giftcards?";
-$lang["giftcards_cost_price"] = "Cost Price";
+$lang["giftcards_confirm_bulk_edit"] = "Are you sure you want to edit the selected Gift Card(s)?";
+$lang["giftcards_confirm_delete"] = "Are you sure you want to delete the selected Gift Card(s)?";
+$lang["giftcards_cost_price"] = "Wholesale Price";
 $lang["giftcards_count"] = "Update Inventory";
 $lang["giftcards_current_quantity"] = "Current Quantity";
 $lang["giftcards_description"] = "Description";
 $lang["giftcards_details_count"] = "Inventory Count Details";
 $lang["giftcards_do_nothing"] = "Do Nothing";
-$lang["giftcards_edit_fields_you_want_to_update"] = "Edit the fields you want to edit for ALL selected giftcards";
-$lang["giftcards_edit_multiple_giftcards"] = "Editing Multiple Giftcards";
-$lang["giftcards_error_adding_updating"] = "Error adding/updating giftcard";
-$lang["giftcards_error_updating_multiple"] = "Error updating giftcards";
-$lang["giftcards_excel_import_failed"] = "Excel import failed";
+$lang["giftcards_edit_fields_you_want_to_update"] = "Edit desired fields for selected Gift Card(s).";
+$lang["giftcards_edit_multiple_giftcards"] = "Edit Multiple Gift Cards.";
+$lang["giftcards_error_adding_updating"] = "Gift Card add or update failed.";
+$lang["giftcards_error_updating_multiple"] = "Gift Card(s) update failed.";
+$lang["giftcards_excel_import_failed"] = "Excel import failed.";
 $lang["giftcards_generate_barcodes"] = "Generate Barcodes";
-$lang["giftcards_giftcard"] = "Giftcard";
-$lang["giftcards_giftcard_number"] = "Giftcard Number";
+$lang["giftcards_giftcard"] = "Gift Card";
+$lang["giftcards_giftcard_number"] = "Gift Card Number";
 $lang["giftcards_info_provided_by"] = "Info provided by";
 $lang["giftcards_inventory_comments"] = "Comments";
-$lang["giftcards_is_serialized"] = "Giftcard has Serial Number";
-$lang["giftcards_low_inventory_giftcards"] = "Low Inventory Giftcards";
+$lang["giftcards_is_serialized"] = "Gift Card has Serial Number";
+$lang["giftcards_low_inventory_giftcards"] = "Low Inventory Gift Cards";
 $lang["giftcards_manually_editing_of_quantity"] = "Manual Edit of Quantity";
-$lang["giftcards_must_select_giftcard_for_barcode"] = "You must select at least 1 giftcard to generate barcodes";
-$lang["giftcards_new"] = "New Giftcard";
-$lang["giftcards_no_description_giftcards"] = "No Description Giftcards";
-$lang["giftcards_no_giftcards_to_display"] = "No Giftcards to display";
+$lang["giftcards_must_select_giftcard_for_barcode"] = "You must select at least one (1) Gift Card to generate barcodes.";
+$lang["giftcards_new"] = "New Gift Card";
+$lang["giftcards_no_description_giftcards"] = "No Description Gift Cards";
+$lang["giftcards_no_giftcards_to_display"] = "No Gift Cards to display.";
 $lang["giftcards_none"] = "None";
-$lang["giftcards_none_selected"] = "You have not selected any giftcards to edit";
-$lang["giftcards_number"] = "Giftcard Number must be a number";
-$lang["giftcards_number_information"] = "Giftcard Number";
-$lang["giftcards_number_required"] = "Giftcard Number is a required field";
-$lang["giftcards_one_or_multiple"] = "giftcard(s)";
+$lang["giftcards_none_selected"] = "No Gift Card(s) selected to edit.";
+$lang["giftcards_number"] = "Gift Card Number must be a number.";
+$lang["giftcards_number_information"] = "Gift Card Number";
+$lang["giftcards_number_required"] = "Gift Card Number is a required field.";
+$lang["giftcards_one_or_multiple"] = "Gift Card(s)";
 $lang["giftcards_person_id"] = "Customer";
 $lang["giftcards_quantity"] = "Quantity";
-$lang["giftcards_quantity_required"] = "Quantity is a required field. Please Close ( X ) to cancel";
-$lang["giftcards_remaining_balance"] = "Giftcard %1 remaining value is %2!";
+$lang["giftcards_quantity_required"] = "Quantity is a required field. Please close (X) to cancel.";
+$lang["giftcards_remaining_balance"] = "Gift Card %1 remaining value is %2!";
 $lang["giftcards_reorder_level"] = "Reorder Level";
-$lang["giftcards_retrive_giftcard_info"] = "Retrieve Giftcard Info";
+$lang["giftcards_retrive_giftcard_info"] = "Retrieve Gift Card Info";
 $lang["giftcards_sales_tax_1"] = "Sales Tax";
 $lang["giftcards_sales_tax_2"] = "Sales Tax 2";
-$lang["giftcards_serialized_giftcards"] = "Serialized Giftcards";
-$lang["giftcards_successful_adding"] = "You have successfully added giftcard";
-$lang["giftcards_successful_bulk_edit"] = "You have successfully updated the selected giftcards";
+$lang["giftcards_serialized_giftcards"] = "Serialized Gift Cards";
+$lang["giftcards_successful_adding"] = "You have successfully added Gift Card";
+$lang["giftcards_successful_bulk_edit"] = "You have successfully updated the selected Gift Card(s)";
 $lang["giftcards_successful_deleted"] = "You have successfully deleted";
-$lang["giftcards_successful_updating"] = "You have successfully updated giftcard";
+$lang["giftcards_successful_updating"] = "You have successfully updated Gift Card";
 $lang["giftcards_supplier"] = "Supplier";
 $lang["giftcards_tax_1"] = "Tax 1";
 $lang["giftcards_tax_2"] = "Tax 2";
 $lang["giftcards_tax_percent"] = "Tax Percent";
 $lang["giftcards_tax_percents"] = "Tax Percent(s)";
-$lang["giftcards_unit_price"] = "Unit Price";
+$lang["giftcards_unit_price"] = "Retail Value";
 $lang["giftcards_upc_database"] = "Barcode Database";
-$lang["giftcards_update"] = "Update Giftcard";
-$lang["giftcards_use_inventory_menu"] = "Use Inv. Menu";
-$lang["giftcards_value"] = "Giftcard Value must be a number";
-$lang["giftcards_value_required"] = "Giftcard Value is a required field";
+$lang["giftcards_update"] = "Update Gift Card";
+$lang["giftcards_use_inventory_menu"] = "Use Inventory Menu";
+$lang["giftcards_value"] = "Gift Card Value must be a number.";
+$lang["giftcards_value_required"] = "Gift Card Value is a required field.";

From 75eec14689241dcfae00d31758efda2d7713d505 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 16:43:22 +0400
Subject: [PATCH 17/27] #1546 Updates

---
 application/language/en-US/item_kits_lang.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/language/en-US/item_kits_lang.php b/application/language/en-US/item_kits_lang.php
index dee476c45..a326d876e 100644
--- a/application/language/en-US/item_kits_lang.php
+++ b/application/language/en-US/item_kits_lang.php
@@ -2,23 +2,23 @@
 
 $lang["item_kits_add_item"] = "Add Item";
 $lang["item_kits_all"] = "All";
-$lang["item_kits_cannot_be_deleted"] = "Could not delete item kit(s)";
-$lang["item_kits_confirm_delete"] = "Are you sure you want to delete the selected item kits?";
+$lang["item_kits_cannot_be_deleted"] = "Item Kit(s) delete failed.";
+$lang["item_kits_confirm_delete"] = "Are you sure you want to delete the selected Item Kit(s)?";
 $lang["item_kits_description"] = "Item Kit Description";
 $lang["item_kits_discount_percent"] = "Discount Percent";
-$lang["item_kits_error_adding_updating"] = "Error adding/updating Item Kit";
+$lang["item_kits_error_adding_updating"] = "Item Kit add or update failed.";
 $lang["item_kits_find_kit_item"] = "Kit Item";
 $lang["item_kits_info"] = "Item Kit Info";
 $lang["item_kits_item"] = "Item";
 $lang["item_kits_items"] = "Items";
-$lang["item_kits_kit"] = "Kit Id";
+$lang["item_kits_kit"] = "Kit ID";
 $lang["item_kits_kit_and_components"] = "Kit and Components";
 $lang["item_kits_kit_and_stock"] = "Kit and Stock";
 $lang["item_kits_kit_only"] = "Kit Only";
 $lang["item_kits_name"] = "Item Kit Name";
 $lang["item_kits_new"] = "New Item Kit";
-$lang["item_kits_no_item_kits_to_display"] = "No item kits to display";
-$lang["item_kits_none_selected"] = "You have not selected any item kits";
+$lang["item_kits_no_item_kits_to_display"] = "No Item Kits to display.";
+$lang["item_kits_none_selected"] = "You have not selected any Item Kits.";
 $lang["item_kits_one_or_multiple"] = "Item Kit(s)";
 $lang["item_kits_price_option"] = "Price Option";
 $lang["item_kits_priced_only"] = "Priced Only";

From 685dde7ceb1b6c02948145433ae7403ccad0d085 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 16:53:13 +0400
Subject: [PATCH 18/27] #1546 Updates

---
 application/language/en-US/customers_lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/language/en-US/customers_lang.php b/application/language/en-US/customers_lang.php
index 275cd7fba..3c16a37e7 100644
--- a/application/language/en-US/customers_lang.php
+++ b/application/language/en-US/customers_lang.php
@@ -14,7 +14,7 @@ $lang["customers_discount"] = "Discount";
 $lang["customers_email_duplicate"] = "Email Address is already present in the database.";
 $lang["customers_error_adding_updating"] = "Customer add or update failed.";
 $lang["customers_excel_import_failed"] = "Excel import failed";
-$lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or is incorrectly formatted.";
+$lang["customers_excel_import_nodata_wrongformat"] = "The uploaded file has no data or is incorrectly formatted.";
 $lang["customers_excel_import_partially_failed"] = "Customer import successful with some failures:";
 $lang["customers_excel_import_success"] = "Customer import successful.";
 $lang["customers_import_items_excel"] = "Customer Import from Excel";

From 2e208a7a2ca6f68da2c8adde61b415051f75a271 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 16:57:34 +0400
Subject: [PATCH 19/27] #1546 Updates

---
 application/language/en-US/items_lang.php | 78 +++++++++++------------
 1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/application/language/en-US/items_lang.php b/application/language/en-US/items_lang.php
index d4fb4fe44..5a36d6c73 100644
--- a/application/language/en-US/items_lang.php
+++ b/application/language/en-US/items_lang.php
@@ -1,79 +1,79 @@
 <?php 
 
-$lang["items_add_minus"] = "Inventory to add/subtract";
+$lang["items_add_minus"] = "Inventory to add or subtract.";
 $lang["items_allow_alt_desciption"] = "";
-$lang["items_allow_alt_description"] = "Allow Alt Description";
+$lang["items_allow_alt_description"] = "Allow Alternate Description";
 $lang["items_amazon"] = "Amazon";
 $lang["items_bulk_edit"] = "Bulk Edit";
-$lang["items_buy_price_required"] = "Purchase price is a required field";
-$lang["items_cannot_be_deleted"] = "Could not deleted selected items, one or more of the selected items has sales.";
-$lang["items_cannot_find_item"] = "Cannot find any information about item";
+$lang["items_buy_price_required"] = "Purchase Price is a required field.";
+$lang["items_cannot_be_deleted"] = "Could not delete selected Item(s), one or more of the selected Items have sales.";
+$lang["items_cannot_find_item"] = "Item not found.";
 $lang["items_category"] = "Category";
-$lang["items_category_required"] = "Category is a required field";
-$lang["items_change_all_to_allow_alt_desc"] = "Allow Alt Desc For All";
-$lang["items_change_all_to_not_allow_allow_desc"] = "Not Allow Alt Desc For All";
-$lang["items_change_all_to_serialized"] = "Change All To Serialized";
-$lang["items_change_all_to_unserialized"] = "Change All To Unserialized";
+$lang["items_category_required"] = "Category is a required field.";
+$lang["items_change_all_to_allow_alt_desc"] = "Allow Alternate Description for all.";
+$lang["items_change_all_to_not_allow_allow_desc"] = "Do not allow Alternate Description for all.";
+$lang["items_change_all_to_serialized"] = "Change all to Serialized";
+$lang["items_change_all_to_unserialized"] = "Change all to Unserialized";
 $lang["items_change_image"] = "Change Image";
-$lang["items_confirm_bulk_edit"] = "Are you sure you want to edit all the items selected?";
-$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!";
-$lang["items_confirm_delete"] = "Are you sure you want to delete the selected items?";
-$lang["items_cost_price"] = "Cost Price";
-$lang["items_cost_price_number"] = "Cost price must be a number";
-$lang["items_cost_price_required"] = "Cost Price is a required field";
+$lang["items_confirm_bulk_edit"] = "Are you sure you want to edit selected Item(s)?";
+$lang["items_confirm_bulk_edit_wipe_taxes"] = "All Item Tax information will be replaced.";
+$lang["items_confirm_delete"] = "Are you sure you want to delete selected item(s)?";
+$lang["items_cost_price"] = "Wholesale Price";
+$lang["items_cost_price_number"] = "Wholesale Price must be a number.";
+$lang["items_cost_price_required"] = "Wholesale Price is a required field.";
 $lang["items_count"] = "Update Inventory";
 $lang["items_current_quantity"] = "Current Quantity";
 $lang["items_description"] = "Description";
 $lang["items_details_count"] = "Inventory Count Details";
 $lang["items_do_nothing"] = "Do Nothing";
-$lang["items_edit_fields_you_want_to_update"] = "Edit the fields you want to edit for ALL selected items";
+$lang["items_edit_fields_you_want_to_update"] = "Edit the desired fields for selected item(s).";
 $lang["items_edit_multiple_items"] = "Editing Multiple Items";
 $lang["items_empty_upc_items"] = "Empty Barcode Items";
 $lang["items_error_adding_updating"] = "Error adding/updating item";
 $lang["items_error_updating_multiple"] = "Error updating items";
 $lang["items_excel_import_failed"] = "Excel import failed";
-$lang["items_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or wrong format";
-$lang["items_excel_import_partially_failed"] = "Most Items imported. But some were not, here is the list";
-$lang["items_excel_import_success"] = "Import of Items successful";
+$lang["items_excel_import_nodata_wrongformat"] = "The uploaded file has no data or is formatted incorrectly.";
+$lang["items_excel_import_partially_failed"] = "Item import successful with some failures:";
+$lang["items_excel_import_success"] = "Item import successful.";
 $lang["items_generate_barcodes"] = "Generate Barcodes";
 $lang["items_image"] = "Avatar";
-$lang["items_import_items_excel"] = "Import items from Excel sheet";
-$lang["items_info_provided_by"] = "Info provided by";
+$lang["items_import_items_excel"] = "Item Import from Excel";
+$lang["items_info_provided_by"] = "Information provided by";
 $lang["items_inventory"] = "Inventory";
 $lang["items_inventory_comments"] = "Comments";
 $lang["items_inventory_data_tracking"] = "Inventory Data Tracking";
 $lang["items_inventory_date"] = "Date";
 $lang["items_inventory_employee"] = "Employee";
-$lang["items_inventory_in_out_quantity"] = "In/Out Qty";
+$lang["items_inventory_in_out_quantity"] = "In/Out Quantity";
 $lang["items_inventory_remarks"] = "Remarks";
 $lang["items_is_deleted"] = "Deleted";
 $lang["items_is_serialized"] = "Item has Serial Number";
 $lang["items_item"] = "Item";
 $lang["items_item_number"] = "Barcode";
-$lang["items_item_number_duplicate"] = "The item number is already present in the database";
+$lang["items_item_number_duplicate"] = "Item Number is already present in the database.";
 $lang["items_kit"] = "Kit";
 $lang["items_location"] = "Location";
 $lang["items_low_inventory_items"] = "Out Of Stock Items";
 $lang["items_manually_editing_of_quantity"] = "Manual Edit of Quantity";
 $lang["items_name"] = "Item Name";
-$lang["items_name_required"] = "Item Name is a required field";
+$lang["items_name_required"] = "Item Name is a required field.";
 $lang["items_new"] = "New Item";
 $lang["items_no_description_items"] = "No Description Items";
-$lang["items_no_items_to_display"] = "No Items to display";
+$lang["items_no_items_to_display"] = "No Items to display.";
 $lang["items_none"] = "None";
-$lang["items_none_selected"] = "You have not selected any items to edit";
-$lang["items_nonstock"] = "Non stocked";
+$lang["items_none_selected"] = "You have not selected any Item(s) to edit";
+$lang["items_nonstock"] = "Non-stocked";
 $lang["items_number_information"] = "Item Number";
-$lang["items_number_required"] = "Barcode is a required field";
+$lang["items_number_required"] = "Barcode is a required field.";
 $lang["items_one_or_multiple"] = "item(s)";
 $lang["items_quantity"] = "Quantity";
-$lang["items_quantity_number"] = "Quantity must be a number";
-$lang["items_quantity_required"] = "Quantity is a required field";
-$lang["items_receiving_quantity"] = "Receiving quantity";
+$lang["items_quantity_number"] = "Quantity must be a number.";
+$lang["items_quantity_required"] = "Quantity is a required field.";
+$lang["items_receiving_quantity"] = "Receiving Quantity";
 $lang["items_remove_image"] = "Remove Image";
 $lang["items_reorder_level"] = "Reorder Level";
-$lang["items_reorder_level_number"] = "Reorder level must be a number";
-$lang["items_reorder_level_required"] = "Reorder level is a required field";
+$lang["items_reorder_level_number"] = "Reorder Level must be a number.";
+$lang["items_reorder_level_required"] = "Reorder Level is a required field.";
 $lang["items_retrive_item_info"] = "Retrive Item Info";
 $lang["items_sales_tax_1"] = "Sales Tax";
 $lang["items_sales_tax_2"] = "Sales Tax 2";
@@ -86,19 +86,19 @@ $lang["items_stock"] = "Stock";
 $lang["items_stock_location"] = "Stock location";
 $lang["items_stock_type"] = "Stock Type";
 $lang["items_successful_adding"] = "You have successfully added item";
-$lang["items_successful_bulk_edit"] = "You have successfully updated the selected items";
+$lang["items_successful_bulk_edit"] = "You have successfully updated the selected item(s)";
 $lang["items_successful_deleted"] = "You have successfully deleted";
 $lang["items_successful_updating"] = "You have successfully updated item";
 $lang["items_supplier"] = "Supplier";
 $lang["items_tax_1"] = "Tax 1";
 $lang["items_tax_2"] = "Tax 2";
 $lang["items_tax_percent"] = "Tax Percent";
-$lang["items_tax_percent_required"] = "Tax Percent is a required field";
+$lang["items_tax_percent_required"] = "Tax Percent is a required field.";
 $lang["items_tax_percents"] = "Tax Percent(s)";
 $lang["items_type"] = "Item Type";
 $lang["items_unit_price"] = "Retail Price";
-$lang["items_unit_price_number"] = "Unit price must be a number";
-$lang["items_unit_price_required"] = "Retail Price is a required field";
+$lang["items_unit_price_number"] = "Unit price must be a number.";
+$lang["items_unit_price_required"] = "Retail Price is a required field.";
 $lang["items_upc_database"] = "Barcode Database";
 $lang["items_update"] = "Update Item";
-$lang["items_use_inventory_menu"] = "Use Inv. Menu";
+$lang["items_use_inventory_menu"] = "Use Inventory Menu";

From 283279955f1ac93d4be37f837ddf990039b2950a Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 16:58:44 +0400
Subject: [PATCH 20/27] #1546 Updates

---
 application/language/en-US/login_lang.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/language/en-US/login_lang.php b/application/language/en-US/login_lang.php
index cc64779a0..983c9ab3a 100644
--- a/application/language/en-US/login_lang.php
+++ b/application/language/en-US/login_lang.php
@@ -1,10 +1,10 @@
 <?php 
 
-$lang["login_gcaptcha"] = "I'm not a robot";
+$lang["login_gcaptcha"] = "I'm not a robot.";
 $lang["login_go"] = "Go";
-$lang["login_invalid_gcaptcha"] = "Invalid I'm not a robot";
-$lang["login_invalid_installation"] = "The installation is not correct, check your php.ini";
-$lang["login_invalid_username_and_password"] = "Invalid username or password";
+$lang["login_invalid_gcaptcha"] = "Invalid I'm not a robot.";
+$lang["login_invalid_installation"] = "The installation is not correct, check your php.ini file.";
+$lang["login_invalid_username_and_password"] = "Invalid Username or Password.";
 $lang["login_login"] = "Login";
 $lang["login_password"] = "Password";
 $lang["login_username"] = "Username";

From df442b734c90d7692b18a701adf88abe6e687412 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 17:00:18 +0400
Subject: [PATCH 21/27] #1546 Updates

---
 application/language/en-US/migrate_lang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/language/en-US/migrate_lang.php b/application/language/en-US/migrate_lang.php
index 8fced1265..64b6b91ea 100644
--- a/application/language/en-US/migrate_lang.php
+++ b/application/language/en-US/migrate_lang.php
@@ -1,7 +1,7 @@
 <?php 
 
 $lang["migrate_backup"] = "Be sure to back up your database before applying any database upgrades.";
-$lang["migrate_failed"] = "The migration did not complete.";
-$lang["migrate_info"] = "Click on Start Migration only if you are ready to apply all database changes and data upgrades to your database";
+$lang["migrate_failed"] = "Migration failed.";
+$lang["migrate_info"] = "Click on Start Migration only if you are ready to apply all database changes and data upgrades to your database.";
 $lang["migrate_start"] = "Start Migration ";
-$lang["migrate_success"] = "Migration completed successfully";
+$lang["migrate_success"] = "Migrate successful.";

From 2754d8413c6a354ff8d549286b04ea669f40f554 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 17:02:44 +0400
Subject: [PATCH 22/27] #1546 Updates

---
 application/language/en-US/module_lang.php | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/application/language/en-US/module_lang.php b/application/language/en-US/module_lang.php
index 3053593ab..e447a17a6 100644
--- a/application/language/en-US/module_lang.php
+++ b/application/language/en-US/module_lang.php
@@ -3,27 +3,27 @@
 $lang["module_config"] = "Store Config";
 $lang["module_config_desc"] = "Change the store's configuration";
 $lang["module_customers"] = "Customers";
-$lang["module_customers_desc"] = "Add, Update, Delete, and Search customers";
+$lang["module_customers_desc"] = "Add, Update, Delete, and Search Customers.";
 $lang["module_employees"] = "Employees";
-$lang["module_employees_desc"] = "Add, Update, Delete, and Search employees";
+$lang["module_employees_desc"] = "Add, Update, Delete, and Search Employees.";
 $lang["module_giftcards"] = "Gift Cards";
-$lang["module_giftcards_desc"] = "Add, Update, Delete and Search gift cards";
+$lang["module_giftcards_desc"] = "Add, Update, Delete and Search Gift Cards.";
 $lang["module_home"] = "Home";
 $lang["module_item_kits"] = "Item Kits";
-$lang["module_item_kits_desc"] = "Add, Update, Delete and Search Item Kits";
+$lang["module_item_kits_desc"] = "Add, Update, Delete and Search Item Kits.";
 $lang["module_items"] = "Items";
-$lang["module_items_desc"] = "Add, Update, Delete, and Search items";
+$lang["module_items_desc"] = "Add, Update, Delete, and Search Items.";
 $lang["module_messages"] = "Messages";
-$lang["module_messages_desc"] = "Send Messages to Customers, Suppliers, Employees et al.";
+$lang["module_messages_desc"] = "Send Messages to Customers, Suppliers and Employees.";
 $lang["module_migrate"] = "Migrate";
-$lang["module_migrate_desc"] = "Update the OSPOS Database";
+$lang["module_migrate_desc"] = "Update the OSPOS Database.";
 $lang["module_receivings"] = "Receivings";
-$lang["module_receivings_desc"] = "Process Purchase orders";
+$lang["module_receivings_desc"] = "Process Purchase Orders.";
 $lang["module_reports"] = "Reports";
-$lang["module_reports_desc"] = "View and generate reports";
+$lang["module_reports_desc"] = "View and generate Reports.";
 $lang["module_sales"] = "Sales";
-$lang["module_sales_desc"] = "Process sales and returns";
+$lang["module_sales_desc"] = "Process Sales and Returns.";
 $lang["module_suppliers"] = "Suppliers";
-$lang["module_suppliers_desc"] = "Add, Update, Delete, and Search suppliers";
+$lang["module_suppliers_desc"] = "Add, Update, Delete, and Search Suppliers.";
 $lang["module_taxes"] = "Taxes";
-$lang["module_taxes_desc"] = "Configure sales taxes";
+$lang["module_taxes_desc"] = "Configure Sales Taxes.";

From 18e6b12541d76a93aff14d10607345f352c0af20 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 17:12:42 +0400
Subject: [PATCH 23/27] #1546 Updates

---
 .../language/en-US/receivings_lang.php        | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/application/language/en-US/receivings_lang.php b/application/language/en-US/receivings_lang.php
index 1922b9ada..9233c6b15 100644
--- a/application/language/en-US/receivings_lang.php
+++ b/application/language/en-US/receivings_lang.php
@@ -1,31 +1,31 @@
 <?php 
 
 $lang["receivings_cancel_receiving"] = "Cancel";
-$lang["receivings_cannot_be_deleted"] = "Receiving(s) could not be deleted";
+$lang["receivings_cannot_be_deleted"] = "Receiving(s) delete failed.";
 $lang["receivings_comments"] = "Comments";
 $lang["receivings_complete_receiving"] = "Finish";
 $lang["receivings_confirm_cancel_receiving"] = "Are you sure you want to clear this receiving? All items will cleared.";
-$lang["receivings_confirm_delete"] = "Are you sure you want to delete this receiving, this action cannot be undone";
+$lang["receivings_confirm_delete"] = "Are you sure you want to delete this receiving? This action cannot be undone.";
 $lang["receivings_confirm_finish_receiving"] = "Are you sure you want to submit this receiving? This cannot be undone.";
 $lang["receivings_cost"] = "Cost";
 $lang["receivings_date"] = "Receiving Date";
-$lang["receivings_date_required"] = "A correct date needs to be filled in";
-$lang["receivings_date_type"] = "Date field is required";
-$lang["receivings_delete_entire_sale"] = "Delete entire sale";
-$lang["receivings_discount"] = "Disc %";
+$lang["receivings_date_required"] = "A correct date must be entered.";
+$lang["receivings_date_type"] = "Date is a required field.";
+$lang["receivings_delete_entire_sale"] = "Delete Entire Sale";
+$lang["receivings_discount"] = "Discount %";
 $lang["receivings_edit"] = "Edit";
 $lang["receivings_edit_sale"] = "Edit Receiving";
 $lang["receivings_employee"] = "Employee";
-$lang["receivings_error_editing_item"] = "Error editing item";
-$lang["receivings_error_requisition"] = "Unable to move inventory from and to the same stock location";
-$lang["receivings_find_or_scan_item"] = "Find/Scan Item";
-$lang["receivings_find_or_scan_item_or_receipt"] = "Find/Scan Item OR Receipt";
+$lang["receivings_error_editing_item"] = "Item edit failed.";
+$lang["receivings_error_requisition"] = "Unable to move Inventory from or to the same Stock Location.";
+$lang["receivings_find_or_scan_item"] = "Find or Scan Item";
+$lang["receivings_find_or_scan_item_or_receipt"] = "Find or Scan Item or Receipt";
 $lang["receivings_id"] = "Receiving ID";
 $lang["receivings_item_name"] = "Item Name";
 $lang["receivings_mode"] = "Receiving Mode";
 $lang["receivings_new_supplier"] = "New Supplier";
 $lang["receivings_one_or_multiple"] = "receiving(s)";
-$lang["receivings_print_after_sale"] = "Print after sale";
+$lang["receivings_print_after_sale"] = "Print After Sale";
 $lang["receivings_quantity"] = "Qty.";
 $lang["receivings_receipt"] = "Receivings Receipt";
 $lang["receivings_receipt_number"] = "Receiving #";
@@ -35,10 +35,10 @@ $lang["receivings_register"] = "Items Receiving";
 $lang["receivings_requisition"] = "Requisition";
 $lang["receivings_return"] = "Return";
 $lang["receivings_select_supplier"] = "Select Supplier (Optional)";
-$lang["receivings_start_typing_supplier_name"] = "Start Typing supplier's name...";
-$lang["receivings_stock_destination"] = "Stock destination";
-$lang["receivings_stock_locaiton"] = "Stock location";
-$lang["receivings_stock_source"] = "Stock source";
+$lang["receivings_start_typing_supplier_name"] = "Start Typing Supplier's name...";
+$lang["receivings_stock_destination"] = "Stock Destination";
+$lang["receivings_stock_locaiton"] = "Stock Location";
+$lang["receivings_stock_source"] = "Stock Source";
 $lang["receivings_successfully_deleted"] = "You have successfully deleted";
 $lang["receivings_successfully_updated"] = "Receiving successfully updated";
 $lang["receivings_supplier"] = "Supplier";
@@ -46,7 +46,7 @@ $lang["receivings_supplier_address"] = "Address";
 $lang["receivings_supplier_email"] = "Email";
 $lang["receivings_supplier_location"] = "Location";
 $lang["receivings_total"] = "Total";
-$lang["receivings_transaction_failed"] = "Receivings Transactions Failed";
-$lang["receivings_unable_to_add_item"] = "Unable to add item to receiving";
-$lang["receivings_unsuccessfully_updated"] = "Receiving unsuccessfully updated";
+$lang["receivings_transaction_failed"] = "Receivings transaction(s) failed.";
+$lang["receivings_unable_to_add_item"] = "Item add to Receiving failed.";
+$lang["receivings_unsuccessfully_updated"] = "Receiving update failed.";
 $lang["receivings_update"] = "Update";

From 5a6e17f9b0f3c73a97b52333c63a6b268980ad31 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 17:15:05 +0400
Subject: [PATCH 24/27] #1546 Updates

---
 application/language/en-US/reports_lang.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/application/language/en-US/reports_lang.php b/application/language/en-US/reports_lang.php
index e45eca380..127e4c03e 100644
--- a/application/language/en-US/reports_lang.php
+++ b/application/language/en-US/reports_lang.php
@@ -5,8 +5,8 @@ $lang["reports_categories"] = "Categories";
 $lang["reports_categories_summary_report"] = "Categories Summary Report";
 $lang["reports_category"] = "Category";
 $lang["reports_comments"] = "Comments";
-$lang["reports_cost"] = "Cost";
-$lang["reports_cost_price"] = "Cost Price";
+$lang["reports_cost"] = "Wholesale";
+$lang["reports_cost_price"] = "Wholesale Price";
 $lang["reports_count"] = "Count";
 $lang["reports_customer"] = "Customer";
 $lang["reports_customers"] = "Customers";
@@ -45,7 +45,7 @@ $lang["reports_low_inventory"] = "";
 $lang["reports_low_inventory_report"] = "";
 $lang["reports_more_than_zero"] = "More than zero";
 $lang["reports_name"] = "Name";
-$lang["reports_no_reports_to_display"] = "No Items to display";
+$lang["reports_no_reports_to_display"] = "No Items to display.";
 $lang["reports_payment_type"] = "Payment Type";
 $lang["reports_payments"] = "Payments";
 $lang["reports_payments_summary_report"] = "Payments Summary Report";
@@ -77,11 +77,11 @@ $lang["reports_sale_type"] = "Sale Type";
 $lang["reports_sales"] = "Sale";
 $lang["reports_sales_amount"] = "Sales amount";
 $lang["reports_sales_summary_report"] = "Sales Summary Report";
-$lang["reports_serial_number"] = "Serial #";
+$lang["reports_serial_number"] = "Serial Number";
 $lang["reports_sold_by"] = "Sold By";
 $lang["reports_sold_to"] = "Sold To";
 $lang["reports_stock_location"] = "Stock Location";
-$lang["reports_sub_total_value"] = "Sub Total";
+$lang["reports_sub_total_value"] = "Subtotal";
 $lang["reports_subtotal"] = "Subtotal";
 $lang["reports_summary_reports"] = "Summary Reports";
 $lang["reports_supplied_by"] = "Supplied by";

From e1ffda5d275c3431a949424f80805fa272e8045f Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 17:36:04 +0400
Subject: [PATCH 25/27] #1546 Updates

---
 application/language/en-US/sales_lang.php | 74 +++++++++++------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/application/language/en-US/sales_lang.php b/application/language/en-US/sales_lang.php
index df6301457..dbb022d4e 100644
--- a/application/language/en-US/sales_lang.php
+++ b/application/language/en-US/sales_lang.php
@@ -17,7 +17,7 @@ $lang["sales_comment"] = "Comment";
 $lang["sales_comments"] = "Comments";
 $lang["sales_complete_sale"] = "Complete";
 $lang["sales_confirm_cancel_sale"] = "Are you sure you want to clear this sale? All items will cleared.";
-$lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sales?";
+$lang["sales_confirm_delete"] = "Are you sure you want to delete the selected Sale(s)?";
 $lang["sales_credit"] = "Credit Card";
 $lang["sales_customer"] = "Name";
 $lang["sales_customer_address"] = "Address";
@@ -28,14 +28,14 @@ $lang["sales_customer_mailchimp_status"] = "Mailchimp status";
 $lang["sales_customer_total"] = "Total";
 $lang["sales_date"] = "Sale Date";
 $lang["sales_date_range"] = "Date Range";
-$lang["sales_date_required"] = "A correct date needs to be filled in";
-$lang["sales_date_type"] = "Date field is required";
+$lang["sales_date_required"] = "A correct date must be entered.";
+$lang["sales_date_type"] = "Date is a required field.";
 $lang["sales_debit"] = "Debit Card";
-$lang["sales_delete_confirmation"] = "Are you sure you want to delete this sale, this action cannot be undone";
-$lang["sales_delete_entire_sale"] = "Delete entire sale";
-$lang["sales_delete_successful"] = "You have successfully deleted a sale";
-$lang["sales_delete_unsuccessful"] = "You have unsuccessfully deleted a sale";
-$lang["sales_description_abbrv"] = "Desc";
+$lang["sales_delete_confirmation"] = "Are you sure you want to delete this sale? This action cannot be undone.";
+$lang["sales_delete_entire_sale"] = "Delete Entire Sale";
+$lang["sales_delete_successful"] = "Sale delete successful.";
+$lang["sales_delete_unsuccessful"] = "Sale delete failed.";
+$lang["sales_description_abbrv"] = "Desc.";
 $lang["sales_discard_quote"] = "Discard";
 $lang["sales_discount"] = "Disc %";
 $lang["sales_discount_included"] = "% Discount";
@@ -49,10 +49,10 @@ $lang["sales_email_receipt"] = "Email Receipt";
 $lang["sales_employee"] = "Employee";
 $lang["sales_entry"] = "Entry";
 $lang["sales_error_editing_item"] = "Error editing item";
-$lang["sales_find_or_scan_item"] = "Find/Scan Item";
-$lang["sales_find_or_scan_item_or_receipt"] = "Find/Scan Item OR Receipt";
+$lang["sales_find_or_scan_item"] = "Find or Scan Item";
+$lang["sales_find_or_scan_item_or_receipt"] = "Find or Scan Item or Receipt";
 $lang["sales_giftcard"] = "Gift Card";
-$lang["sales_giftcard_balance"] = "Giftcard Balance";
+$lang["sales_giftcard_balance"] = "Gift Card Balance";
 $lang["sales_giftcard_number"] = "Gift Card Number";
 $lang["sales_group_by_category"] = "Group by Category";
 $lang["sales_group_by_type"] = "Group by Type";
@@ -63,35 +63,35 @@ $lang["sales_invoice_enable"] = "Create Invoice";
 $lang["sales_invoice_filter"] = "Invoices";
 $lang["sales_invoice_no_email"] = "This customer does not have a valid email address";
 $lang["sales_invoice_number"] = "Invoice #";
-$lang["sales_invoice_number_duplicate"] = "Please enter an unique invoice number";
+$lang["sales_invoice_number_duplicate"] = "Invoice Number must be unique.";
 $lang["sales_invoice_sent"] = "Invoice sent to";
 $lang["sales_invoice_unsent"] = "Invoice failed to be sent to";
 $lang["sales_invoice_update"] = "Recount";
-$lang["sales_item_insufficient_of_stock"] = "Item is Insufficient of Stock";
+$lang["sales_item_insufficient_of_stock"] = "Item has insufficient stock.";
 $lang["sales_item_name"] = "Item Name";
 $lang["sales_item_number"] = "Item #";
-$lang["sales_item_out_of_stock"] = "Item is Out of Stock";
+$lang["sales_item_out_of_stock"] = "Item is out of stock.";
 $lang["sales_mode"] = "Register Mode";
-$lang["sales_must_enter_numeric"] = "Must enter numeric value for amount tendered";
-$lang["sales_must_enter_numeric_giftcard"] = "Must enter numeric value for giftcard number";
+$lang["sales_must_enter_numeric"] = "Amount Tendered must be a number.";
+$lang["sales_must_enter_numeric_giftcard"] = "Gift Card Number must be a number.";
 $lang["sales_new_customer"] = "New Customer";
 $lang["sales_new_item"] = "New Item";
 $lang["sales_no_description"] = "None";
 $lang["sales_no_filter"] = "All";
-$lang["sales_no_items_in_cart"] = "There are no items in the cart";
-$lang["sales_no_sales_to_display"] = "No sales to display";
-$lang["sales_none_selected"] = "You have not selected any sales to delete";
-$lang["sales_one_or_multiple"] = "sale(s)";
+$lang["sales_no_items_in_cart"] = "There are no Items in the cart.";
+$lang["sales_no_sales_to_display"] = "No Sales to display.";
+$lang["sales_none_selected"] = "You have not selected any Sale(s) to delete.";
+$lang["sales_one_or_multiple"] = "Sale(s)";
 $lang["sales_payment"] = "Payment Type";
 $lang["sales_payment_amount"] = "Amount";
-$lang["sales_payment_not_cover_total"] = "Payment Amount does not cover Total";
+$lang["sales_payment_not_cover_total"] = "Payment Amount must be greater than or equal to Total.";
 $lang["sales_payment_type"] = "Type";
 $lang["sales_payments_total"] = "Payments Total";
 $lang["sales_price"] = "Price";
-$lang["sales_print_after_sale"] = "Print after sale";
-$lang["sales_quantity"] = "Qty.";
-$lang["sales_quantity_less_than_reorder_level"] = "Warning, Desired Quantity is below reorder level";
-$lang["sales_quantity_less_than_zero"] = "Warning, Desired Quantity is Insufficient. You can still process the sale, but check your inventory";
+$lang["sales_print_after_sale"] = "Print after Sale";
+$lang["sales_quantity"] = "Quantity";
+$lang["sales_quantity_less_than_reorder_level"] = "Warning: Desired Quantity is below Reorder Level for that Item.";
+$lang["sales_quantity_less_than_zero"] = "Warning: Desired Quantity is insufficient. You can still process the sale, but audit your inventory.";
 $lang["sales_quote"] = "Quote";
 $lang["sales_quote_number"] = "Quote Number";
 $lang["sales_quote_sent"] = "Quote sent to";
@@ -117,27 +117,27 @@ $lang["sales_send_receipt"] = "Send Receipt";
 $lang["sales_serial"] = "Serial";
 $lang["sales_show_invoice"] = "Show Invoice";
 $lang["sales_show_receipt"] = "Show Receipt";
-$lang["sales_start_typing_customer_name"] = "Start typing customer's details...";
-$lang["sales_start_typing_item_name"] = "Start typing item's name or scan barcode...";
-$lang["sales_stock_location"] = "Stock location";
-$lang["sales_sub_total"] = "Sub Total";
+$lang["sales_start_typing_customer_name"] = "Start typing customer details...";
+$lang["sales_start_typing_item_name"] = "Start typing Item Name or scan Barcode...";
+$lang["sales_stock_location"] = "Stock Location";
+$lang["sales_sub_total"] = "Subtotal";
 $lang["sales_successfully_deleted"] = "You have successfully deleted";
-$lang["sales_successfully_suspended_sale"] = "Your sale has been successfully suspended";
-$lang["sales_successfully_updated"] = "Sale successfully updated";
+$lang["sales_successfully_suspended_sale"] = "Sale suspend successful.";
+$lang["sales_successfully_updated"] = "Sale update successful.";
 $lang["sales_suspend_sale"] = "Suspend";
 $lang["sales_suspended_sale_id"] = "ID";
 $lang["sales_suspended_sales"] = "Suspended";
 $lang["sales_table"] = "Table";
-$lang["sales_takings"] = "Takings";
+$lang["sales_takings"] = "Daily Sales";
 $lang["sales_tax"] = "Tax";
 $lang["sales_tax_percent"] = "Tax %";
 $lang["sales_total"] = "Total";
 $lang["sales_total_tax_exclusive"] = "Tax excluded";
-$lang["sales_transaction_failed"] = "Sales Transaction Failed";
-$lang["sales_unable_to_add_item"] = "Unable to add item to sale";
-$lang["sales_unsuccessfully_deleted"] = "Sale(s) could not be deleted";
-$lang["sales_unsuccessfully_suspended_sale"] = "Your sale has been unsuccessfully suspended";
-$lang["sales_unsuccessfully_updated"] = "Sale unsuccessfully updated";
+$lang["sales_transaction_failed"] = "Sales Transaction failed.";
+$lang["sales_unable_to_add_item"] = "Item add to Sale failed";
+$lang["sales_unsuccessfully_deleted"] = "Sale(s) delete failed.";
+$lang["sales_unsuccessfully_suspended_sale"] = "Sale suspend failed.";
+$lang["sales_unsuccessfully_updated"] = "Sale update failed.";
 $lang["sales_unsuspend"] = "Unsuspend";
 $lang["sales_unsuspend_and_delete"] = "Action";
 $lang["sales_update"] = "Update";

From 2adbc403ad040bc798a98ab4f07e085aa8fe4ae8 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 17:38:16 +0400
Subject: [PATCH 26/27] #1546 Updates

---
 application/language/en-US/suppliers_lang.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/application/language/en-US/suppliers_lang.php b/application/language/en-US/suppliers_lang.php
index e1bc579d9..1d3464510 100644
--- a/application/language/en-US/suppliers_lang.php
+++ b/application/language/en-US/suppliers_lang.php
@@ -1,18 +1,18 @@
 <?php 
 
-$lang["suppliers_account_number"] = "Account #";
+$lang["suppliers_account_number"] = "Account Number";
 $lang["suppliers_agency_name"] = "Agency Name";
-$lang["suppliers_cannot_be_deleted"] = "Could not deleted selected suppliers, one or more of the selected suppliers has sales.";
+$lang["suppliers_cannot_be_deleted"] = "Could not delete selected Supplier(s). One or more have Sales.";
 $lang["suppliers_company_name"] = "Company Name";
-$lang["suppliers_company_name_required"] = "Company Name is a required field";
-$lang["suppliers_confirm_delete"] = "Are you sure you want to delete the selected suppliers?";
-$lang["suppliers_error_adding_updating"] = "Error adding/updating supplier";
+$lang["suppliers_company_name_required"] = "Company Name is a required field.";
+$lang["suppliers_confirm_delete"] = "Are you sure you want to delete the selected Supplier(s)?";
+$lang["suppliers_error_adding_updating"] = "Supplier update or add failed.";
 $lang["suppliers_new"] = "New Supplier";
-$lang["suppliers_none_selected"] = "You have not selected any suppliers to delete";
-$lang["suppliers_one_or_multiple"] = "supplier(s)";
-$lang["suppliers_successful_adding"] = "You have successfully added supplier";
+$lang["suppliers_none_selected"] = "You have not selected Supplier(s) to delete.";
+$lang["suppliers_one_or_multiple"] = "Supplier(s)";
+$lang["suppliers_successful_adding"] = "You have successfully added Supplier";
 $lang["suppliers_successful_deleted"] = "You have successfully deleted";
-$lang["suppliers_successful_updating"] = "You have successfully updated supplier";
+$lang["suppliers_successful_updating"] = "You have successfully updated Supplier";
 $lang["suppliers_supplier"] = "Supplier";
 $lang["suppliers_supplier_id"] = "Id";
 $lang["suppliers_update"] = "Update Supplier";

From b98d56f12618d431bc6b054e364a8440a629bdd1 Mon Sep 17 00:00:00 2001
From: objecttothis <17935339+objecttothis@users.noreply.github.com>
Date: Thu, 7 Sep 2017 17:51:20 +0400
Subject: [PATCH 27/27] #1546 Updates

---
 application/language/en-US/taxes_lang.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/application/language/en-US/taxes_lang.php b/application/language/en-US/taxes_lang.php
index f0cd6ddd7..426d04b85 100644
--- a/application/language/en-US/taxes_lang.php
+++ b/application/language/en-US/taxes_lang.php
@@ -1,11 +1,11 @@
 <?php 
 
 $lang["taxes_add_exception"] = "Add Exception";
-$lang["taxes_confirm_delete"] = "Confirm deletion of tax code";
+$lang["taxes_confirm_delete"] = "Are you sure you want to delete this Tax Code? This action cannot be undone.";
 $lang["taxes_default_tax_category"] = "Default Tax Category";
-$lang["taxes_error_adding_updating"] = "Error adding/updating tax code";
+$lang["taxes_error_adding_updating"] = "Tax Code add or update failed.";
 $lang["taxes_new"] = "New Tax Code";
-$lang["taxes_no_taxes_to_display"] = "No taxes code available to display";
+$lang["taxes_no_taxes_to_display"] = "No Taxes Code available to display.";
 $lang["taxes_round_half_down"] = "Half Down";
 $lang["taxes_round_half_even"] = "Half Even";
 $lang["taxes_round_half_odd"] = "Half Odd";
@@ -16,16 +16,16 @@ $lang["taxes_sales_tax_by_invoice"] = "Sales Tax by Invoice";
 $lang["taxes_successful_deleted"] = "You have successfully deleted";
 $lang["taxes_tax_category"] = "Tax Category";
 $lang["taxes_tax_code"] = "Tax Code";
-$lang["taxes_tax_code_cannot_be_deleted"] = "Could not delete selected tax code";
+$lang["taxes_tax_code_cannot_be_deleted"] = "Tax Code delete failed.";
 $lang["taxes_tax_code_name"] = "Tax Code Name";
-$lang["taxes_tax_code_required"] = "Tax code is a required field";
-$lang["taxes_tax_code_successful_deleted"] = "You have successfully deleted tax code";
+$lang["taxes_tax_code_required"] = "Tax Code is a required field.";
+$lang["taxes_tax_code_successful_deleted"] = "You have successfully deleted Tax Code";
 $lang["taxes_tax_code_successful_updated"] = "You have successfully updated";
-$lang["taxes_tax_code_successful_updating"] = "You have successfully updated tax code";
+$lang["taxes_tax_code_successful_updating"] = "You have successfully updated Tax Code";
 $lang["taxes_tax_code_successfully_added"] = "You have successfully added";
 $lang["taxes_tax_code_type"] = "Tax Code Type";
 $lang["taxes_tax_rate"] = "Tax Rate";
-$lang["taxes_tax_rate_numeric"] = "Tax rate must be a number";
-$lang["taxes_tax_rate_required"] = "Tax rate is a required field";
+$lang["taxes_tax_rate_numeric"] = "Tax Rate must be a number.";
+$lang["taxes_tax_rate_required"] = "Tax Rate is a required field.";
 $lang["taxes_update"] = "Update Sales Category Tax";
 $lang["taxes_vat_tax"] = "VAT Tax";