Prepare Release 3.1.1 notes (#1546 )

Added link to Weblate into README (#1569 )
Add CSRF issue with suhosin to FAQ with link to #1492
2026-05-27 09:49:26 -04:00 · 2017-09-09 09:49:54 +01:00 · 2017-09-09 09:24:10 +01:00 · 2017-09-07 22:06:15 +01:00 · 2017-09-07 20:43:58 +01:00 · 2017-09-07 20:42:30 +01:00
47 changed files with 590 additions and 571 deletions
--- a/.htaccess
+++ b/.htaccess
@@ -1,8 +1,9 @@
 # redirect to public page
-RewriteEngine On
-
-RewriteCond %{REQUEST_URI} !^/public$
-RewriteRule ^(.*)/$ /public/ [R=301,L]
+  <IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteCond %{REQUEST_URI} !^public$
+    RewriteRule ^(.*)$ %{REQUEST_URI}public/ [R=301,L]
+  </IfModule>

 # disable directory browsing
 # For security reasons, Option all cannot be overridden.
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ The main features are:
 The software is written in PHP language, it uses MySQL (or MariaDB) as data storage back-end and has a simple but intuitive user interface.

 The latest 3.x version is a complete overhaul of the original software.
-It is now based on Bootstrap 3.x using Bootswatch themes, and still uses CodeIgniter 3.x as framework.
+It is now based on Bootstrap 3 using Bootswatch themes, and still uses CodeIgniter 3 as framework.
 It also has improved functionality and security.

 Deployed to a Cloud it's a SaaS (Software as a Service) solution.
@@ -105,6 +105,7 @@ Local install
 9. Enjoy
 10. Oops an issue? Please make sure you read the FAQ, wiki page and you checked open and closed issue on GitHub. PHP display_errors is disabled by default. Create an application/config/.env file from the .env.example to enable it in a development environment. 

+
 Local install using Docker
 --------------------------

@@ -147,6 +148,16 @@ month of uptime on the platform. A full setup will only take about 2 minutes by
 More info [on maintaining a docker](https://github.com/jekkos/opensourcepos/wiki/Docker-cloud-maintenance) install can be found on the wiki


+Language Translations
+---------------------
+
+To help us with OSPOS translations please use [Weblate website here](http://weblate.jpeelaer.net) and sign up. After registering you can subscribe to different languages and you will be notified once a new translation is added.
+
+Please also read the [wiki page here](https://github.com/jekkos/opensourcepos/wiki/Adding-translations) to find our Translations Guideline.
+
+Only with the help of the community we can keep language translations up to date.
+
+
 Reporting Bugs
 --------------

@@ -185,3 +196,5 @@ FAQ
 * If the avatar pictures are not shown in Items or at Item save time you get an error, please make sure your public and subdirs are assigned to the correct owner and the access permission is set to 755

 * If you have problems with the encryption support or you get an error please make sure `php5-mcrypt` is installed
+
+* If you have suhosin installed and face an issue with CSRF, please make sure you read [issue #1492](https://github.com/jekkos/opensourcepos/issues/1492)
--- a/WHATS_NEW.txt
+++ b/WHATS_NEW.txt
@@ -1,5 +1,16 @@
+Version 3.1.1
+-------------
+ Updated en-US and en-GB translations, better grammar and consistency
+ Fixed database migration issue with VAT tax included
+ Fixed database backup bug
+ Fixed Gift card error
+ Fixed database upgrade to 3.1.x script (now it's to 3.1.1 and there is no 3.1.0 anymore)
+ Fixed old database upgrade scripts for people upgrading from 2.x versions
+ Fixed .htaccess file in opensourcepos root dir (it was not forwarding to public subdir)
+ Fixed few jQuery 2.0 upgrade issues
+
 Version 3.1.0
-----------
+-------------
 + MySQL 5.7 and PHP 7.x support
 + Advanced Tax support with customer tax categories and etc,
 + Better HORECA use case support with Dinner Table sale tagging
@@ -28,7 +39,7 @@ Version 3.1.0
 + Minor bugfixes

 Version 3.0.2
-----------
+-------------
 + Fixed error when performing scans multiple times in a row
 + Fixed summary reports
 + Protect Employee privacy printing just the first letter of the family name
@@ -37,7 +48,7 @@ Version 3.0.2
 + Minor bugfixes

 Version 3.0.1
-----------
+-------------
 + *CodeIgniter 3.1.2 Upgrade*
 + *Substantial database performance improvements*
 + *Improved security: email and sms passwords encryption, removed phpinfo.php*
@@ -52,7 +63,7 @@ Version 3.0.1
 + Minor bugfixes and some general code clean up

 Version 3.0.0
-----------
+-------------
 + *CodeIgniter 3.1 Upgrade*
 + Major UI overhaul based on *Boostrap 3.0 and Bootswatch Themes*
 + New tabular views with advanced filtering using *Bootstrap Tables*
@@ -70,8 +81,8 @@ Version 3.0.0
 + About 280 closed issues under 3.0.0 release label, too many to produce a meaningful list
 + Various code cleanup, refactoring, optimisation and etc.

-Version 2.4
-----------
+Version 2.4.0
+-------------
 + *CodeIgniter 3.0.5* Upgrade (please read UPGRADE.txt)
 + Fix for spurious logouts
 + Apache .htaccess mod_expiry caching and security optimizations
@@ -144,7 +155,6 @@ Version 2.3.2

 Version 2.3.1
 -------------
-
 + Extra report permissions (this includes a refactoring of the database model - new grants table)
 + Tax inclusive/exclusive pricing
 + Receivings amount multiplication (can be configured in items section)
@@ -153,8 +163,8 @@ Version 2.3.1
 + Fix item import through csv
 + Bug fixes for reports

-Version 2.3
-----------
+Version 2.3.0
+-------------
 + Support for multiple stock locations

 Version 2.2.2
@@ -166,7 +176,7 @@ Version 2.2.2
 + Fix duplicated session cookies in http headers (this broke the application when running on nginx)

 Version 2.1.1
-------------
+---------------
 + Barcodes on the order receipt weren't generated correctly
 + Sales edit screen for detailed sales reports is now available with thickbox as in the rest of the application
 + Indonesian language files updated (Oktafianus)
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -8,7 +8,7 @@
 | 
 | 
 */ 
-$config['application_version'] = '3.1.0';
+$config['application_version'] = '3.1.1';

 /* 
 |-------------------------------------------------------------------------- 
--- a/application/language/en-GB/common_lang.php
+++ b/application/language/en-GB/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"] = "Post code";
+$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"] = "Post Code";
--- a/application/language/en-GB/config_lang.php
+++ b/application/language/en-GB/config_lang.php
@@ -127,11 +127,11 @@ $lang["config_gcaptcha_site_key_required"] = "reCAPTCHA Site Key is a required f
 $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"] = "Giftcard Number";
+$lang["config_giftcard_number"] = "Gift Card Number";
 $lang["config_giftcard_random"] = "Generate Random";
 $lang["config_giftcard_series"] = "Generate in Series";
 $lang["config_info"] = "Information";
-$lang["config_info_configuration"] = "Store Information";
+$lang["config_info_configuration"] = "Shop Information";
 $lang["config_invoice"] = "Invoice";
 $lang["config_invoice_configuration"] = "Invoice Print Settings";
 $lang["config_invoice_default_comments"] = "Default Invoice Comments";
--- a/application/language/en-GB/customers_lang.php
+++ b/application/language/en-GB/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_available_points"] = "Available Points";
+$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 delete the selected customers, one or more of the selected customers has sales.";
+$lang["customers_cannot_be_deleted"] = "Could not delete the selected Customer(s), one or more of the selected Customer(s) has sales.";
 $lang["customers_company_name"] = "Company";
-$lang["customers_confirm_delete"] = "Are you sure you want to delete the selected customer(s)?";
+$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"] = "The 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"] = "Error adding/updating Customer";
 $lang["customers_excel_import_failed"] = "The excel import failed";
-$lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or has some 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"] = "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";
 $lang["customers_mailchimp_activity_click"] = "Email click";
 $lang["customers_mailchimp_activity_lastopen"] = "Last open email";
 $lang["customers_mailchimp_activity_open"] = "Email open";
@@ -31,13 +31,13 @@ $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 any customer(s) to delete";
-$lang["customers_one_or_multiple"] = "customer(s)";
+$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";
-$lang["customers_successful_adding"] = "You have successfully added a customer";
-$lang["customers_successful_deleted"] = "You have successfully deleted a Giftcard";
-$lang["customers_successful_updating"] = "You have successfully updated customer";
+$lang["customers_successful_adding"] = "You have successfully added Customer";
+$lang["customers_successful_deleted"] = "You have successfully deleted Customer";
+$lang["customers_successful_updating"] = "You have successfully updated Customer";
 $lang["customers_tax_code"] = "Tax Code";
 $lang["customers_taxable"] = "Taxable";
 $lang["customers_total"] = "Total spent";
--- a/application/language/en-GB/datepicker_lang.php
+++ b/application/language/en-GB/datepicker_lang.php
@@ -7,14 +7,14 @@ $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_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";
--- a/application/language/en-GB/employees_lang.php
+++ b/application/language/en-GB/employees_lang.php
@@ -1,34 +1,34 @@
 <?php 

 $lang["employees_basic_information"] = "Information";
-$lang["employees_cannot_be_deleted"] = "Could not delete the 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 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 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"] = "Current Password is invalid";
 $lang["employees_employee"] = "Employee";
-$lang["employees_error_adding_updating"] = "Error adding/updating employee";
+$lang["employees_error_adding_updating"] = "Employee add or update failed";
 $lang["employees_error_deleting_demo_admin"] = "You cannot delete the demo admin user";
 $lang["employees_error_updating_demo_admin"] = "You cannot 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_one_or_multiple"] = "employee(s)";
+$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_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";
 $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_successful_deleted"] = "You have successfully deleted a Giftcard";
-$lang["employees_successful_updating"] = "You have successfully updated employee";
-$lang["employees_unsuccessful_change_password"] = "Password unsuccessfully changed";
+$lang["employees_successful_adding"] = "Employee add successful";
+$lang["employees_successful_change_password"] = "Password change successful";
+$lang["employees_successful_deleted"] = "You have successfully deleted Employee";
+$lang["employees_successful_updating"] = "You have successfully updated Employee";
+$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_minlength"] = "Username must be at least 5 characters";
 $lang["employees_username_required"] = "Username is a required field";
--- a/application/language/en-GB/giftcards_lang.php
+++ b/application/language/en-GB/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 delete selected giftcards, one or more of the selected giftcards has sales.";
-$lang["giftcards_cannot_find_giftcard"] = "Cannot find any information about the Giftcard";
-$lang["giftcards_cannot_use"] = "Giftcard %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 Giftcard(s) 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 alt desc for all";
-$lang["giftcards_change_all_to_not_allow_allow_desc"] = "Do 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 alternate description for all";
 $lang["giftcards_change_all_to_serialized"] = "Change All To Serialised";
 $lang["giftcards_change_all_to_unserialized"] = "Change All To Unserialised";
-$lang["giftcards_confirm_bulk_edit"] = "Are you sure you want to edit all the selected giftcards?";
-$lang["giftcards_confirm_delete"] = "Are you sure you want to delete the selected giftcards?";
+$lang["giftcards_confirm_bulk_edit"] = "Are you sure you want to edit all 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"] = "Cost 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 the 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"] = "The 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 Giftcards to generate barcodes";
-$lang["giftcards_new"] = "New Giftcard";
-$lang["giftcards_no_description_giftcards"] = "No description Giftcards";
+$lang["giftcards_must_select_giftcard_for_barcode"] = "You must select at least one 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 Giftcards 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"] = "Giftcards(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"] = "Serialised Giftcards";
-$lang["giftcards_successful_adding"] = "You have successfully added a Giftcard";
-$lang["giftcards_successful_bulk_edit"] = "You have successfully updated the selected Giftcards";
-$lang["giftcards_successful_deleted"] = "You have successfully deleted a Giftcard";
-$lang["giftcards_successful_updating"] = "You have successfully updated a Giftcard";
+$lang["giftcards_serialized_giftcards"] = "Serialised Gift Cards";
+$lang["giftcards_successful_adding"] = "You have successfully added Gift Card";
+$lang["giftcards_successful_bulk_edit"] = "You have successfully updated the selected Gift Cards";
+$lang["giftcards_successful_deleted"] = "You have successfully deleted Gift Card";
+$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"] = "Sell Price";
 $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";
--- a/application/language/en-GB/item_kits_lang.php
+++ b/application/language/en-GB/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 Kit(s)";
 $lang["item_kits_one_or_multiple"] = "Item Kit(s)";
 $lang["item_kits_price_option"] = "Price Option";
 $lang["item_kits_priced_only"] = "Priced Only";
@@ -26,6 +26,6 @@ $lang["item_kits_print_option"] = "Print Option";
 $lang["item_kits_quantity"] = "Quantity";
 $lang["item_kits_sequence"] = "Sequence";
 $lang["item_kits_successful_adding"] = "You have successfully added Item Kit";
-$lang["item_kits_successful_deleted"] = "You have successfully deleted a Giftcard";
+$lang["item_kits_successful_deleted"] = "You have successfully deleted Item Kit";
 $lang["item_kits_successful_updating"] = "You have successfully updated Item Kit";
 $lang["item_kits_update"] = "Update Item Kit";
--- a/application/language/en-GB/items_lang.php
+++ b/application/language/en-GB/items_lang.php
@@ -1,25 +1,25 @@
 <?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 delete the 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 the 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"] = "Do Not Allow Alt Desc For All";
-$lang["items_change_all_to_serialized"] = "Change All To Serialised";
-$lang["items_change_all_to_unserialized"] = "Change All To Unserialised";
+$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 Serialised";
+$lang["items_change_all_to_unserialized"] = "Change all to Unserialised";
 $lang["items_change_image"] = "Change Image";
-$lang["items_confirm_bulk_edit"] = "Are you sure you want to edit all the selected items?";
-$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_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 the selected Item(s)?";
 $lang["items_cost_price"] = "Cost Price";
-$lang["items_cost_price_number"] = "Cost price must be a number";
+$lang["items_cost_price_number"] = "Cost Price must be a number";
 $lang["items_cost_price_required"] = "Cost Price is a required field";
 $lang["items_count"] = "Update Inventory";
 $lang["items_current_quantity"] = "Current Quantity";
@@ -32,25 +32,25 @@ $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"] = "The excel import failed";
-$lang["items_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or has some 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";
@@ -61,7 +61,7 @@ $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_none"] = "None";
-$lang["items_none_selected"] = "You have not selected any items to edit";
+$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";
@@ -69,11 +69,11 @@ $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_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"] = "Retrieve Item Info";
 $lang["items_sales_tax_1"] = "Sales Tax";
 $lang["items_sales_tax_2"] = "Sales Tax 2";
@@ -85,10 +85,10 @@ $lang["items_standard"] = "Standard";
 $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_deleted"] = "You have successfully deleted a Giftcard";
-$lang["items_successful_updating"] = "You have successfully updated item";
+$lang["items_successful_adding"] = "You have successfully added Item";
+$lang["items_successful_bulk_edit"] = "You have successfully updated the selected Items";
+$lang["items_successful_deleted"] = "You have successfully deleted Item";
+$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";
@@ -96,9 +96,9 @@ $lang["items_tax_percent"] = "Tax Percent";
 $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"] = "Sell Price";
+$lang["items_unit_price_number"] = "Sell Price must be a number";
+$lang["items_unit_price_required"] = "Sell 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";
--- a/application/language/en-GB/login_lang.php
+++ b/application/language/en-GB/login_lang.php
@@ -3,8 +3,8 @@
 $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_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";
--- a/application/language/en-GB/migrate_lang.php
+++ b/application/language/en-GB/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_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";
--- a/application/language/en-GB/module_lang.php
+++ b/application/language/en-GB/module_lang.php
@@ -1,29 +1,29 @@
 <?php 

-$lang["module_config"] = "Store Config";
-$lang["module_config_desc"] = "Change the store's configuration";
+$lang["module_config"] = "Configuration";
+$lang["module_config_desc"] = "Change the OSPOS'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_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_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";
--- a/application/language/en-GB/receivings_lang.php
+++ b/application/language/en-GB/receivings_lang.php
@@ -1,7 +1,7 @@
 <?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 be cleared.";
@@ -9,23 +9,23 @@ $lang["receivings_confirm_delete"] = "Are you sure you want to delete this recei
 $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,18 +35,18 @@ $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_successfully_deleted"] = "You have successfully deleted a Giftcard";
+$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 receiving";
 $lang["receivings_successfully_updated"] = "Receiving successfully updated";
 $lang["receivings_supplier"] = "Supplier";
 $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";
--- a/application/language/en-GB/reports_lang.php
+++ b/application/language/en-GB/reports_lang.php
@@ -81,8 +81,8 @@ $lang["reports_serial_number"] = "Serial #";
 $lang["reports_sold_by"] = "Sold By";
 $lang["reports_sold_to"] = "Sold To";
 $lang["reports_stock_location"] = "Stock Location";
-$lang["reports_sub_total_value"] = "Subtotal";
-$lang["reports_subtotal"] = "Subtotal";
+$lang["reports_sub_total_value"] = "Sub Total";
+$lang["reports_subtotal"] = "Sub Total";
 $lang["reports_summary_reports"] = "Summary Reports";
 $lang["reports_supplied_by"] = "Supplied by";
 $lang["reports_supplier"] = "Supplier";
@@ -95,6 +95,6 @@ $lang["reports_taxes_summary_report"] = "Taxes Summary Report";
 $lang["reports_total"] = "Total";
 $lang["reports_total_inventory_value"] = "Total Inventory Value";
 $lang["reports_type"] = "Type";
-$lang["reports_unit_price"] = "Retail Price";
+$lang["reports_unit_price"] = "Sell Price";
 $lang["reports_used"] = "Points Used";
 $lang["reports_zero_and_less"] = "Zero and less";
--- a/application/language/en-GB/sales_lang.php
+++ b/application/language/en-GB/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 be cleared.";
-$lang["sales_confirm_delete"] = "Are you sure you want to delete the selected sale(s)?";
+$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,13 +28,13 @@ $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_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 %";
@@ -49,11 +49,11 @@ $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_giftcard"] = "Giftcard";
-$lang["sales_giftcard_balance"] = "Giftcard Balance";
-$lang["sales_giftcard_number"] = "Giftcard Number";
+$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"] = "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";
 $lang["sales_id"] = "Sale ID";
@@ -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"] = "There is insufficient stock for this item";
+$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_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_type"] = "Type";
 $lang["sales_payments_total"] = "Payments Total";
 $lang["sales_price"] = "Price";
-$lang["sales_print_after_sale"] = "Print after sale";
+$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_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,13 +117,13 @@ $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"] = "Subtotal";
-$lang["sales_successfully_deleted"] = "You have successfully deleted a Giftcard";
-$lang["sales_successfully_suspended_sale"] = "Your sale has been successfully suspended";
-$lang["sales_successfully_updated"] = "Sale successfully updated";
+$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"] = "Sub Total";
+$lang["sales_successfully_deleted"] = "You have successfully deleted sale";
+$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";
@@ -133,11 +133,11 @@ $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";
--- a/application/language/en-GB/suppliers_lang.php
+++ b/application/language/en-GB/suppliers_lang.php
@@ -2,17 +2,17 @@

 $lang["suppliers_account_number"] = "Account #";
 $lang["suppliers_agency_name"] = "Agency Name";
-$lang["suppliers_cannot_be_deleted"] = "Could not delete the selected suppliers, one or more of the selected suppliers has sales.";
-$lang["suppliers_company_name"] = "Company Name";
+$lang["suppliers_cannot_be_deleted"] = "Could not delete the selected Supplier(s). One or more have Sales";
+$lang["suppliers_company_name"] = "Company Name is a required field";
 $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"] = "Error adding/updating supplier";
+$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 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 a Giftcard";
-$lang["suppliers_successful_updating"] = "You have successfully updated supplier";
+$lang["suppliers_none_selected"] = "You have not selected any 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 Supplier";
+$lang["suppliers_successful_updating"] = "You have successfully updated Supplier";
 $lang["suppliers_supplier"] = "Supplier";
-$lang["suppliers_supplier_id"] = "Id";
+$lang["suppliers_supplier_id"] = "ID";
 $lang["suppliers_update"] = "Update Supplier";
--- a/application/language/en-GB/taxes_lang.php
+++ b/application/language/en-GB/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";
--- 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,18 +34,18 @@ $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_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"] = "";
-$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";
--- 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)";
@@ -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";
@@ -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 an 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"] = "The 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"] = "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"] = "Table must be unique.";
 $lang["config_dinner_table_enable"] = "Enable Dinner Tables";
-$lang["config_dinner_table_invalid_chars"] = "The 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";
@@ -138,35 +138,35 @@ $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";
-$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";
-$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";
-$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";
@@ -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_required"] = "Number Locale is a required field";
-$lang["config_number_locale_tooltip"] = "Find a suitable locale through this link";
+$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";
@@ -217,23 +217,23 @@ $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"] = "Please use an unique location name";
-$lang["config_stock_location_invalid_chars"] = "The stock location name 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"] = "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.";
--- 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_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"] = "The 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"] = "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 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"] = "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";
 $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 any customer(s) to delete.";
 $lang["customers_one_or_multiple"] = "customer(s)";
 $lang["customers_quantity"] = "Quantity";
 $lang["customers_stats_info"] = "Stats";
--- a/application/language/en-US/datepicker_lang.php
+++ b/application/language/en-US/datepicker_lang.php
@@ -7,14 +7,14 @@ $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_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";
--- 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 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 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"] = "Current Password is invalid.";
 $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"] = "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";
 $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"] = "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 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";
 $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.";
--- 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 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 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 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 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.";
--- 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";
--- 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";
--- 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";
--- 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.";
--- 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.";
--- 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";
--- 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";
--- 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";
--- 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";
--- 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";
--- a/application/libraries/Barcode_lib.php
+++ b/application/libraries/Barcode_lib.php
@@ -1,4 +1,3 @@
-
 <?php if (!defined('BASEPATH')) exit('No direct script access allowed');

 use emberlabs\Barcode\BarcodeBase;
--- a/application/migrations/20170502221506_sales_tax_data.php
+++ b/application/migrations/20170502221506_sales_tax_data.php
@@ -8,7 +8,7 @@ class Migration_Sales_Tax_Data extends CI_Migration

 		$this->load->library('tax_lib');
 		$this->load->library('sale_lib');
-		$CI =& get_instance();
+
 	}

 	public function up()
@@ -37,8 +37,10 @@ class Migration_Sales_Tax_Data extends CI_Migration

 	private function upgrade_tax_history_for_sale($sale_id)
 	{
-		$tax_decimals = $this->CI->config->config['tax_decimals'];
-		$tax_included = $this->CI->config->config['tax_included'];
+		$CI =& get_instance();
+		$tax_decimals = $CI->config->config['tax_decimals'];
+		$tax_included = $CI->config->config['tax_included'];
+		$customer_sales_tax_support = $CI->config->config['customer_sales_tax_support'];

 		if($tax_included)
 		{
@@ -65,15 +67,20 @@ class Migration_Sales_Tax_Data extends CI_Migration
 			}
 			else
 			{
-				$item_tax_amount = $this->tax_lib->get_sales_tax_for_amount($tax_basis, $item['percent'], '0', $tax_decimals);
+				$item_tax_amount = $this->tax_lib->get_sales_tax_for_amount($tax_basis, $item['percent'], PHP_ROUND_HALF_UP, $tax_decimals);
 			}
 			$this->update_sales_items_taxes_amount($sale_id, $item['line'], $item['name'], $item['percent'], $tax_type, $item_tax_amount);
-			$this->tax_lib->update_sales_taxes($sales_taxes, $tax_type, $tax_group, $item['percent'], $tax_basis, $item_tax_amount, $tax_group_sequence, '0', $sale_id, $item['name']);
+			$this->tax_lib->update_sales_taxes($sales_taxes, $tax_type, $tax_group, $item['percent'], $tax_basis, $item_tax_amount, $tax_group_sequence, PHP_ROUND_HALF_UP, $sale_id, $item['name']);
 			$tax_group_sequence += 1;
 		}

-		$this->tax_lib->apply_invoice_taxing($sales_taxes);
+		// Not sure when this would ever kick in, but this is technically the correct logic.
+		if($customer_sales_tax_support)
+		{
+			$this->tax_lib->apply_invoice_taxing($sales_taxes);
+		}

+		$this->tax_lib->round_sales_taxes($sales_taxes);
 		$this->save_sales_tax($sales_taxes);
 	}

--- a/application/models/Giftcard.php
+++ b/application/models/Giftcard.php
@@ -76,7 +76,7 @@ class Giftcard extends CI_Model
 	}

 	/*
-	Gets an giftcard id given an giftcard number
+	Gets an giftcard id given a giftcard number
 	*/
 	public function get_giftcard_id($giftcard_number)
 	{
@@ -117,6 +117,7 @@ class Giftcard extends CI_Model
 			if($this->db->insert('giftcards', $giftcard_data))
 			{
 				$giftcard_data['giftcard_number'] = $this->db->insert_id();
+				$giftcard_data['giftcard_id'] = $this->db->insert_id();

 				return TRUE;
 			}
--- a/application/views/configs/locale_config.php
+++ b/application/views/configs/locale_config.php
@@ -340,25 +340,17 @@ $(document).ready(function()
 {
 	$("span").tooltip();

-	var number_locale_params = {
-		url: "<?php echo site_url($controller_name . '/check_number_locale')?>",
-		type: "POST"
-	};
-
 	$("#currency_symbol, #thousands_separator").change(function() {
 		var field = $(this).attr('id');
 		var value = $(this).is(":checkbox") ? $(this).is(":checked") : $(this).val();
-		var data =
-		{
-			number_locale: $("#number_locale").val()
-		};
+		var data = { number_locale: $("#number_locale").val() };
 		data[field] = value;
-		$.post($.extend(number_locale_params, {
-			data: $.extend(csrf_form_base(), data),
-			success: function(response) {
+		$.post("<?php echo site_url($controller_name . '/check_number_locale')?>",
+			$.extend(csrf_form_base(), data),
+			function(response) {
 				$("#number_locale_example").text(response.number_locale_example);
 			}
-		}));
+		);
 	});

 	$('#locale_config_form').validate($.extend(form_support.handler, {
@@ -368,7 +360,10 @@ $(document).ready(function()
 			number_locale:
 			{
 				required: true,
-				remote: $.extend(number_locale_params, {
+				remote: $.extend({
+						url: "<?php echo site_url($controller_name . '/check_number_locale')?>",
+						type: "POST"
+					}, {
 					data: $.extend(csrf_form_base(), {
 						"number_locale" : function() {
 							return $("#number_locale").val();
--- a/application/views/configs/mailchimp_config.php
+++ b/application/views/configs/mailchimp_config.php
@@ -50,26 +50,19 @@
 $(document).ready(function()
 {
 	$('#mailchimp_api_key').change(function() {
-		$.post($.extend(
-			{
-				url: "<?php echo site_url($controller_name . '/ajax_check_mailchimp_api_key')?>",
-				type: 'POST'
-			},
-			{
-				data: $.extend(csrf_form_base(), {
+		$.post("<?php echo site_url($controller_name . '/ajax_check_mailchimp_api_key')?>",
+			$.extend(csrf_form_base(), {
 					'mailchimp_api_key': $('#mailchimp_api_key').val()
-				}),
-				success: function(response) {
-					$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
-					$('#mailchimp_list_id').empty();
-					$.each(response.mailchimp_lists, function(val, text) {
-						$('#mailchimp_list_id').append(new Option(text, val));
-					});
-					$('#mailchimp_list_id').prop('selectedIndex', 0);
-				},
-				dataType: 'json'
+			}),
+			function(response) {
+				$.notify(response.message, { type: response.success ? 'success' : 'danger'} );
+				$('#mailchimp_list_id').empty();
+				$.each(response.mailchimp_lists, function(val, text) {
+					$('#mailchimp_list_id').append(new Option(text, val));
+				});
+				$('#mailchimp_list_id').prop('selectedIndex', 0);
 			}
-		));
+		);
 	});

 	$('#mailchimp_config_form').validate($.extend(form_support.handler, {
--- a/bower.json
+++ b/bower.json
@@ -1,7 +1,7 @@
 {
  "name": "opensourcepos",
  "description": "Open Source Point of Sale is a web based POS system written in the PHP language. It uses MySQL as backend and has a simple user interface",
-  "version": "3.1.0",
+  "version": "3.1.1",
  "license": "MIT",
  "authors": [
    "jekkos <jeroen.peelaerts - at - gmail.com>",
--- a/database/2.3.1_to_2.3.2.sql
+++ b/database/2.3.1_to_2.3.2.sql
@@ -4,6 +4,12 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('barcode_second_row', 'item_code'),
 ('barcode_third_row', 'cost_price'),
 ('barcode_num_in_row', '2'),
+('barcode_font', 'Arial'),
+('barcode_font_size', '10'),
+('barcode_height', '50'),
+('barcode_quality', '100'),
+('barcode_type', 'Code39'),
+('barcode_width', '250'),
 ('company_logo', ''),
 ('barcode_page_width', '100'),      
 ('barcode_page_cellspacing', '20'),
--- a/database/2.3_to_2.3.1.sql
+++ b/database/2.3_to_2.3.1.sql
@@ -105,6 +105,9 @@ ALTER TABLE `ospos_items`
   ADD COLUMN `receiving_quantity` int(11) DEFAULT '1',
   DROP COLUMN `quantity`;

+-- add record_time column to ospos_giftcards table
+ALTER TABLE ospos_giftcards ADD record_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
+
 -- add foreign key to giftcards table
 ALTER TABLE `ospos_giftcards`
  ADD CONSTRAINT `ospos_giftcards_ibfk_1` FOREIGN KEY (`person_id`) REFERENCES `ospos_people` (`person_id`);
--- a/database/3.0.2_to_3.1.1.sql
+++ b/database/3.0.2_to_3.1.1.sql
@@ -311,12 +311,6 @@ INSERT INTO `ospos_app_config` (`key`, `value`) VALUES

 INSERT INTO `ospos_app_config` (`key`, `value`) VALUES
 ('barcode_formats', '[]'),
-('barcode_font', 'Arial'),
-('barcode_font_size', '10'),
-('barcode_height', '50'),
-('barcode_quality', '100'),
-('barcode_type', 'Code39'),
-('barcode_width', '250'),
 ('receiving_calculate_average_price', '0');

 -- replace old tokens in ospos_app_config
@@ -359,7 +353,6 @@ DROP TABLE `ospos_sales_suspended_payments`, `ospos_sales_suspended_items_taxes`

 DELETE FROM `ospos_app_config` WHERE `key` = 'print_after_sale';

-ALTER TABLE ospos_giftcards ADD record_time timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP;
 ALTER TABLE ospos_giftcards MODIFY value decimal(15,2) NOT NULL;
 ALTER TABLE ospos_items MODIFY cost_price decimal(15,2) NOT NULL;
 ALTER TABLE ospos_items MODIFY unit_price decimal(15,2) NOT NULL;
--- a/deployment.json
+++ b/deployment.json
@@ -1,5 +1,4 @@
 {
-
    "package": {
        "name": "opensourcepos",
        "repo": "opensourcepos",
@@ -14,10 +13,9 @@
        "public_download_numbers": true,
        "public_stats": true
    },
-"version": {
-        "name": "3.1.0"
+	"version": {
+        "name": "3.1.1"
    },
-
    "files":
    [
        {"includePattern": "dist(.*)\\.(zip)", "uploadPattern": "$1.$2"}
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "opensourcepos",
-  "version": "3.1.0",
+  "version": "3.1.1",
  "description": "Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.",
  "main": "index.php",
  "license": "MIT",
Author	SHA1	Message	Date
FrancescoUK	76a0026bdb	Prepare Release 3.1.1 notes (#1546 )	2017-09-09 09:49:54 +01:00
FrancescoUK	f2c4024734	Added link to Weblate into README (#1569 )	2017-09-09 09:24:10 +01:00
FrancescoUK	5a9aa96b7e	Add CSRF issue with suhosin to FAQ with link to #1492	2017-09-07 22:06:15 +01:00
FrancescoUK	d98e788775	Removed en_US wrong folder	2017-09-07 20:43:58 +01:00
FrancescoUK	8a59470872	More updates to en-GB translations	2017-09-07 20:42:30 +01:00
FrancescoUK	de38e26856	Merge pull request #1560 from objecttothis/patch-1 en-US Translation Corrections (#1546)	2017-09-07 20:41:30 +01:00
objecttothis	b98d56f126	#1546 Updates	2017-09-07 17:51:20 +04:00
objecttothis	2adbc403ad	#1546 Updates	2017-09-07 17:38:16 +04:00
objecttothis	e1ffda5d27	#1546 Updates	2017-09-07 17:36:04 +04:00
objecttothis	5a6e17f9b0	#1546 Updates	2017-09-07 17:15:05 +04:00
objecttothis	18e6b12541	#1546 Updates	2017-09-07 17:12:42 +04:00
objecttothis	2754d8413c	#1546 Updates	2017-09-07 17:02:44 +04:00
objecttothis	df442b734c	#1546 Updates	2017-09-07 17:00:18 +04:00
objecttothis	283279955f	#1546 Updates	2017-09-07 16:58:44 +04:00
objecttothis	2e208a7a2c	#1546 Updates	2017-09-07 16:57:34 +04:00
objecttothis	685dde7ceb	#1546 Updates	2017-09-07 16:53:13 +04:00
objecttothis	75eec14689	#1546 Updates	2017-09-07 16:43:22 +04:00
objecttothis	941e968fda	#1546 Updates	2017-09-07 16:41:01 +04:00
objecttothis	cf24aebebc	#1546 Updates	2017-09-07 15:57:46 +04:00
objecttothis	75e0b2898e	#1546 Updates	2017-09-07 15:56:10 +04:00
objecttothis	4936f1b302	#1546 Updates	2017-09-07 15:55:13 +04:00
objecttothis	e4215df835	#1546 Updates	2017-09-07 15:53:23 +04:00
objecttothis	c6a519e4ad	#1546 Updates	2017-09-07 15:48:56 +04:00
objecttothis	2b7e9cf631	#1546 Updates	2017-09-07 15:45:46 +04:00
FrancescoUK	a496b971db	Fix more en-GB translations	2017-09-06 18:51:11 +01:00
FrancescoUK	4d7397647f	Fix db backup failure (#1557 )	2017-09-06 18:26:42 +01:00
Weblate	0b28e0c668	Add again last weblate version of en_US	2017-09-06 11:46:30 +00:00
objecttothis	ba2e274cb0	#1546 Updates	2017-09-06 10:07:02 +04:00
objecttothis	9aee57da2f	#1546 Updates	2017-09-06 09:48:34 +04:00
objecttothis	2499bc5015	#1546 Updates	2017-09-06 09:46:49 +04:00
objecttothis	6f9a15f464	#1546 Updates	2017-09-06 09:37:39 +04:00
objecttothis	51db8d5b91	#1546 Updates	2017-09-06 09:35:31 +04:00
objecttothis	040f4711d1	#1546 Updates	2017-09-06 09:11:22 +04:00
objecttothis	60fc671a9d	#1546 Updates	2017-09-06 09:10:09 +04:00
objecttothis	48aa05f858	#1546 Updates	2017-09-06 09:02:04 +04:00
objecttothis	71de1d1247	#1546 Updates	2017-09-06 08:37:58 +04:00
FrancescoUK	12fcfcb24a	Merge pull request #1552 from objecttothis/patch-1 Update to #1491	2017-09-05 19:51:14 +01:00
objecttothis	a77fd438c5	Update to #1491 Two changes for #1491 Check for mod rewrite to be enabled Correct the code which before was not redirecting on Apache 2.4 and nginx. Please test.	2017-09-05 22:37:44 +04:00
jekkos	887c8374b6	Fix jquery brokenness after upgrade to 2.0 (#1546 )	2017-09-05 19:02:27 +02:00
FrancescoUK	2bc702acc8	Fix old database upgrade scripts (#1546 )	2017-09-04 19:37:38 +01:00
FrancescoUK	e1743f4d9f	Fix database upgrade script issue and rename it to 3.0.2 to 3.1.1 (#1546 )	2017-09-04 18:32:58 +01:00
FrancescoUK	ec96bd8c89	Fix VAT (tax included) migration issue (#1546 )	2017-09-04 18:12:48 +01:00
Steve Ireland	bd38c1dc67	This resolves the migration issue that was reported plus a couple of other issues that were spotted but not yet reported.	2017-09-04 11:35:42 -04:00
FrancescoUK	9e7b0db950	Bump vs to 3.1.1, fix Giftcard bug, fix en_GB translations (#1546 )	2017-09-03 18:22:46 +01:00