diff --git a/Dockerfile b/Dockerfile
index 863be5fb3..7c2577996 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,7 +7,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
 
 RUN a2enmod rewrite
 RUN docker-php-ext-install mysql mysqli bcmath intl gd sockets
-RUN echo "date.timezone = \"UTC\"" > /usr/local/etc/php/conf.d/timezone.ini
+RUN echo "date.timezone = \"\${PHP_TIMEZONE}\"" > /usr/local/etc/php/conf.d/timezone.ini
 
 WORKDIR /app
 COPY . /app
diff --git a/README.md b/README.md
index eac20fa3a..66bb97c0f 100644
--- a/README.md
+++ b/README.md
@@ -91,13 +91,15 @@ month of uptime on the platform. A full setup will only take about 2 minutes by
 2. Create a [docker cloud account](https://cloud.docker.com)
 3. Login to docker cloud
 4. Associate your docker cloud account with your previously created digital ocean account under settings
-5. Create a new node on DigitalOcean through the `Infrastructure > Nodes` tab. Fill in a name (ospos) and choose a region near to you
+5. Create a new node on DigitalOcean through the `Infrastructure > Nodes` tab. Fill in a name (ospos) and choose a region near to you. We recommend to choose a node with minimum 1G RAM for the whole stack
 6. Click [![Deploy to Docker Cloud](https://files.cloud.docker.com/images/deploy-to-dockercloud.svg)](https://cloud.docker.com/stack/deploy/?repo=https://github.com/jekkos/opensourcepos) 
 7. Othewise create a new stack under `Applications > Stacks` and paste the [contents of docker-cloud.yml](https://github.com/jekkos/opensourcepos/blob/master/docker-cloud.yml) from the source repository in the text field and hit `Create and deploy` 
 8. Find your website url under `Infrastructure > Nodes > <yournode> > Endpoints > web`
 9. Login with default username/password admin/pointofsale
 10. DNS name for this server can be easily configured in the DigitalOcean control panel
 
+More info [on maintaining a docker](https://github.com/jekkos/opensourcepos/wiki/Docker-cloud-maintenance) install can be found on the wiki
+
 Local install
 -------------
 1. Create/locate a new mysql database to install open source point of sale into
diff --git a/application/language/de/common_lang.php b/application/language/de/common_lang.php
index 295eef665..2c200caf7 100644
--- a/application/language/de/common_lang.php
+++ b/application/language/de/common_lang.php
@@ -28,7 +28,7 @@ $lang["common_last_name_required"] = "Nachname ist erforderlich";
 $lang["common_last_page"] = "Letzte";
 $lang["common_learn_about_project"] = "für neueste Nachrichten zum Projekt";
 $lang["common_list_of"] = "Liste von";
-$lang["common_logout"] = "Logout";
+$lang["common_logout"] = "Ausloggen";
 $lang["common_new"] = "Neu";
 $lang["common_no_persons_to_display"] = "Keine Personen zum Anzeigen";
 $lang["common_none_selected_text"] = "Nichts ausgewählt";
@@ -36,7 +36,7 @@ $lang["common_or"] = "Oder";
 $lang["common_phone_number"] = "Telefon";
 $lang["common_phone_number_required"] = "Telefon ist erforderlich";
 $lang["common_please_visit_my"] = "Bitte beuschen Sie ";
-$lang["common_powered_by"] = "Powered by";
+$lang["common_powered_by"] = "Unterstützt von";
 $lang["common_price"] = "Preis";
 $lang["common_remove"] = "Annulieren";
 $lang["common_return_policy"] = "Rücknahmeerklärung";
@@ -62,4 +62,4 @@ $lang["common_export_excel"] = "Excel Export";
 $lang["common_export_excel_yes"] = "Ja";
 $lang["common_export_excel_no"] = "Nein";
 $lang["common_required"] = "Erforderlich";
-$lang["common_id"] = "Id";
+$lang["common_id"] = "ID";
diff --git a/application/language/de/customers_lang.php b/application/language/de/customers_lang.php
index dc21d95fe..999d6c78b 100644
--- a/application/language/de/customers_lang.php
+++ b/application/language/de/customers_lang.php
@@ -6,7 +6,7 @@ $lang["customers_cannot_be_deleted"] = "Kunde kann nicht gelöscht werden, ein o
 $lang["customers_company_name"] = "Firmenname";
 $lang["customers_confirm_delete"] = "Wollen Sie die gewählten Kunden wirklich löschen?";
 $lang["customers_customer"] = "Kunde";
-$lang["customers_discount"] = "Discount";
+$lang["customers_discount"] = "Rabatt";
 $lang["customers_error_adding_updating"] = "Fehler beim Hinzufügen/Ändern";
 $lang["customers_new"] = "Neuer Kunde";
 $lang["customers_none_selected"] = "Sie haben keinen Kunde zum Löschen gewählt";
diff --git a/application/language/es/common_lang.php b/application/language/es/common_lang.php
index 79360d322..184375a63 100644
--- a/application/language/es/common_lang.php
+++ b/application/language/es/common_lang.php
@@ -22,7 +22,7 @@ $lang["common_first_page"] = "Primera";
 $lang["common_gender"] = "Género";
 $lang["common_gender_female"] = "F";
 $lang["common_gender_male"] = "M";
-$lang["common_inv"] = "inv";
+$lang["common_inv"] = "Inv";
 $lang["common_last_name"] = "Apellidos";
 $lang["common_last_name_required"] = "Apellidos es un campo requerido";
 $lang["common_last_page"] = "Ultima";
diff --git a/application/language/es/config_lang.php b/application/language/es/config_lang.php
index 7fa764fb5..84a045f45 100644
--- a/application/language/es/config_lang.php
+++ b/application/language/es/config_lang.php
@@ -27,8 +27,8 @@ $lang["config_barcode_third_row"] = "Fila 2";
 $lang["config_barcode_type"] = "Tipo de Código de Barra";
 $lang["config_barcode_width"] = "Ancho (px)";
 $lang["config_barcode_generate_if_empty"] = "Generar si esta vacio";
-$lang["config_bottom"] = "Bottom";
-$lang["config_center"] = "Center";
+$lang["config_bottom"] = "Abajo";
+$lang["config_center"] = "Centro";
 $lang["config_company"] = "Nombre del Comercio";
 $lang["config_company_logo"] = "Logotipo del Comercio";
 $lang["config_company_select_image"] = "Seleccionar Imagen";
@@ -81,12 +81,12 @@ $lang["config_email"] = "Email";
 $lang["config_email_configuration"] = "Configuracion de correo";
 $lang["config_email_protocol"] = "Protocolo";
 $lang["config_email_mailpath"] = "Rurta a Sendmail";
-$lang["config_email_smtp_host"] = "SMTP Server";
-$lang["config_email_smtp_port"] = "SMTP Port";
-$lang["config_email_smtp_crypto"] = "SMTP Encryption";
-$lang["config_email_smtp_timeout"] = "SMTP Timeout (s)";
-$lang["config_email_smtp_user"] = "SMTP Username";
-$lang["config_email_smtp_pass"] = "SMTP Password";
+$lang["config_email_smtp_host"] = "Servidor SMTP";
+$lang["config_email_smtp_port"] = "Puerto SMTP";
+$lang["config_email_smtp_crypto"] = "Encriptado SMTP";
+$lang["config_email_smtp_timeout"] = "T. Espera SMTP (s)";
+$lang["config_email_smtp_user"] = "Usuario SMTP";
+$lang["config_email_smtp_pass"] = "Pasword SMTP";
 $lang["config_fax"] = "Fax";
 $lang["config_general"] = "General";
 $lang["config_general_configuration"] = "Configuración General";
@@ -102,7 +102,7 @@ $lang["config_jsprintsetup_required"] = "Advertencia!Esta funcionalidad desactiv
 $lang["config_language"] = "Idioma";
 $lang["config_left"] = "Izquierda";
 $lang["config_license"] = "Licencia";
-$lang["config_license_configuration"] = "License Statement";
+$lang["config_license_configuration"] = "Anuncio de Licencia";
 $lang["config_lines_per_page"] = "Líneas por página";
 $lang["config_lines_per_page_number"] = "Líneas por página debe ser un número";
 $lang["config_lines_per_page_required"] = "Líneas por página es requerido";
@@ -174,7 +174,7 @@ $lang["config_tax_decimals"] = "Decimales de impuestos";
 $lang["config_tax_included"] = "Impuestos incluidos";
 $lang["config_thousands_separator"] = "Separador de miles";
 $lang["config_timezone"] = "Zona Horaria";
-$lang["config_top"] = "Top";
+$lang["config_top"] = "Arriba";
 $lang["config_website"] = "Sitio Web";
 $lang["config_number_locale"] = "Ubicación";
 $lang["config_return_policy_required"] = "Política de Devolución es requerida";
diff --git a/application/language/es/item_kits_lang.php b/application/language/es/item_kits_lang.php
index a829afd53..cfbb549a8 100644
--- a/application/language/es/item_kits_lang.php
+++ b/application/language/es/item_kits_lang.php
@@ -8,7 +8,7 @@ $lang["item_kits_error_adding_updating"] = "Error agregando/actualizando el Kit
 $lang["item_kits_info"] = "Info de Kit de Artículos";
 $lang["item_kits_item"] = "Artículo";
 $lang["item_kits_items"] = "Artículos";
-$lang["item_kits_kit"] = "Kit Id";
+$lang["item_kits_kit"] = "Kit ID";
 $lang["item_kits_name"] = "Nombre del Kit de Artículos";
 $lang["item_kits_new"] = "Nuevo Kit de Artículos";
 $lang["item_kits_no_item_kits_to_display"] = "No hay kits de artículos para mostrar";
diff --git a/application/language/es/receivings_lang.php b/application/language/es/receivings_lang.php
index 62ecd9e9d..46badd027 100644
--- a/application/language/es/receivings_lang.php
+++ b/application/language/es/receivings_lang.php
@@ -22,7 +22,7 @@ $lang["receivings_error_requisition"] = "No se puede mover el inventorio desde y
 $lang["receivings_find_or_scan_item"] = "Encontrar/Escanear Artículo";
 $lang["receivings_find_or_scan_item_or_receipt"] = "Encontrar/Escanear Artículo o Entrada";
 $lang["receivings_id"] = "ID de Entrada";
-$lang["receivings_reference"] = "Reference";
+$lang["receivings_reference"] = "Referencia";
 $lang["receivings_item_name"] = "Nombre del Artículo";
 $lang["receivings_mode"] = "Modo de Entradas";
 $lang["receivings_new_supplier"] = "Nuevo Proveedor";
diff --git a/application/language/es/reports_lang.php b/application/language/es/reports_lang.php
index 9fd0dbd9a..1e9112d55 100644
--- a/application/language/es/reports_lang.php
+++ b/application/language/es/reports_lang.php
@@ -75,7 +75,7 @@ $lang["reports_serial_number"] = "S/N:";
 $lang["reports_sold_by"] = "Vendido Por";
 $lang["reports_sold_to"] = "Vendido A";
 $lang["reports_stock_location"] = "Ubicación de Inventario";
-$lang["reports_subtotal"] = "Subtotal";
+$lang["reports_subtotal"] = "Sub-total";
 $lang["reports_summary_reports"] = "Reportes Resumidos";
 $lang["reports_supplied_by"] = "Provisto por";
 $lang["reports_supplier"] = "Proveedor";
diff --git a/application/language/es/sales_lang.php b/application/language/es/sales_lang.php
index 5895ccb6e..df393d9fd 100644
--- a/application/language/es/sales_lang.php
+++ b/application/language/es/sales_lang.php
@@ -28,7 +28,7 @@ $lang["sales_delete_confirmation"] = "¿Seguro(a) de querer borrar esta venta? E
 $lang["sales_delete_entire_sale"] = "Borrar la venta completa";
 $lang["sales_delete_successful"] = "Has borrado satisfactoriamente una venta";
 $lang["sales_delete_unsuccessful"] = "No he podido borrar la venta satisfactoriamente";
-$lang["sales_description_abbrv"] = "Desc";
+$lang["sales_description_abbrv"] = "Descr";
 $lang["sales_discount"] = "% Descuento";
 $lang["sales_discount_included"] = "% Descuento";
 $lang["sales_discount"] = "Descuento";
@@ -94,7 +94,7 @@ $lang["sales_sale_time"] = "Hora";
 $lang["sales_select_customer"] = "Seleccionar Cliente (Opcional)";
 $lang["sales_send_invoice"] = "Enviar Factura";
 $lang["sales_send_receipt"] = "Enviar Recibo";
-$lang["sales_serial"] = "Serial";
+$lang["sales_serial"] = "Serie";
 $lang["sales_show_invoice"] = "Factura";
 $lang["sales_show_receipt"] = "Recibo";
 $lang["sales_start_typing_customer_name"] = "Empieza a escribir el cliente...";
diff --git a/application/language/pt-BR/config_lang.php b/application/language/pt-BR/config_lang.php
index d05c3f165..b509dd54e 100644
--- a/application/language/pt-BR/config_lang.php
+++ b/application/language/pt-BR/config_lang.php
@@ -28,7 +28,7 @@ $lang["config_barcode_type"] = "Tipo de código de barras";
 $lang["config_barcode_width"] = "Largura (px)";
 $lang["config_barcode_generate_if_empty"] = "Gerar se vazio";
 $lang["config_bottom"] = "Inferior";
-$lang["config_center"] = "Center";
+$lang["config_center"] = "Centro";
 $lang["config_company"] = "Nome da empresa";
 $lang["config_company_logo"] = "Logo";
 $lang["config_company_select_image"] = "Selecionar imagem";
@@ -77,7 +77,7 @@ $lang["config_default_tax_rate_number"] = "A taxa de Imposto padrão deve ser um
 $lang["config_default_tax_rate_required"] = "A taxa de Imposto padrão é um campo obrigatório";
 $lang["config_default_tax_name_required"] = "Nome da taxa padrão é requerida";
 $lang["config_dot"] = "ponto";
-$lang["config_email"] = "Email";
+$lang["config_email"] = "E-mail";
 $lang["config_email_configuration"] = "Configuração de Email";
 $lang["config_email_protocol"] = "Protocolo";
 $lang["config_email_mailpath"] = "Caminho para Sendmail";
diff --git a/application/language/pt-BR/login_lang.php b/application/language/pt-BR/login_lang.php
index 9e30434a7..e09dec97a 100644
--- a/application/language/pt-BR/login_lang.php
+++ b/application/language/pt-BR/login_lang.php
@@ -2,6 +2,6 @@
 
 $lang["login_go"] = "Entrar";
 $lang["login_invalid_username_and_password"] = "Usuário ou senha inválido";
-$lang["login_login"] = "Login";
+$lang["login_login"] = "Autenticação";
 $lang["login_password"] = "Senha";
 $lang["login_username"] = "Usuário";
diff --git a/application/language/pt-BR/reports_lang.php b/application/language/pt-BR/reports_lang.php
index 336d09912..f3b9345b3 100644
--- a/application/language/pt-BR/reports_lang.php
+++ b/application/language/pt-BR/reports_lang.php
@@ -90,7 +90,7 @@ $lang["reports_type"] = "Tipo";
 $lang["reports_item_count"] = "Filtro por quantidade";
 $lang["reports_cost_price"] = "Preço de Custo";
 $lang["reports_unit_price"] = "Preço Varejo";
-$lang["reports_sub_total_value"] = "Sub Total";
+$lang["reports_sub_total_value"] = "Subtotal";
 $lang["reports_total_inventory_value"] = "Valor Total Inventário";
 $lang["reports_zero_and_less"] = "Zero e menor";
 $lang["reports_more_than_zero"] = "Maior do que zero";
diff --git a/application/language/pt-BR/sales_lang.php b/application/language/pt-BR/sales_lang.php
index 6cace4e2b..deaff8dc1 100644
--- a/application/language/pt-BR/sales_lang.php
+++ b/application/language/pt-BR/sales_lang.php
@@ -100,7 +100,7 @@ $lang["sales_show_receipt"] = "recibo";
 $lang["sales_start_typing_customer_name"] = "Nome Cliente ...";
 $lang["sales_start_typing_item_name"] = "Produto ...";
 $lang["sales_stock_location"] = "Estoque";
-$lang["sales_sub_total"] = "Sub Total";
+$lang["sales_sub_total"] = "Subtotal";
 $lang["sales_successfully_deleted"] = "Apagado com sucesso";
 $lang["sales_successfully_suspended_sale"] = "Suspenso com sucesso";
 $lang["sales_successfully_updated"] = "Venda atualizada";
diff --git a/application/language/th/config_lang.php b/application/language/th/config_lang.php
index 3bf7eb5d5..90016deda 100644
--- a/application/language/th/config_lang.php
+++ b/application/language/th/config_lang.php
@@ -167,14 +167,14 @@ $lang["config_statistics"] = "Send statistics";
 $lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes";
 $lang["config_stock_location"] = "สถานที่เก็บ";
 $lang["config_stock_location_duplicate"] = "";
-$lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
+$lang["config_stock_location_invalid_chars"] = "ชื่อสต๊อกสถานที่เก็บสินค้าต้องไม่มีอักษรพิเศษ '_'";
 $lang["config_stock_location_required"] = "จำเป็นต้องระบุสถานที่เก็บ";
-$lang["config_takings_printer"] = "Takings Printer";
-$lang["config_tax_decimals"] = "Tax Decimals";
+$lang["config_takings_printer"] = "เลือกเครื่องพิมพ์";
+$lang["config_tax_decimals"] = "จำนวนทศนิยมภาษี";
 $lang["config_tax_included"] = "รวมภาษีแล้ว";
 $lang["config_thousands_separator"] = "ตัวคั่นหลักพัน";
 $lang["config_timezone"] = "โซนเวลา";
-$lang["config_top"] = "Top";
+$lang["config_top"] = "ด้านบน";
 $lang["config_website"] = "เว็บไซต์";
 $lang["config_number_locale"] = "Localisation";
 $lang["config_return_policy_required"] = "ต้องกรอกเงื่อนไขการคืนสินค้า";
diff --git a/application/language/th/datepicker_lang.php b/application/language/th/datepicker_lang.php
index f90abd3f1..be4e6c743 100644
--- a/application/language/th/datepicker_lang.php
+++ b/application/language/th/datepicker_lang.php
@@ -15,7 +15,7 @@ $lang["datepicker_this_year"] = "ปีนี้";
 $lang["datepicker_today_last_year"] = "Today Last Year";
 $lang["datepicker_yesterday"] = "เมื่อวานนี้";
 $lang["datepicker_apply"] = "Apply";
-$lang["datepicker_cancel"] = "Cancel";
+$lang["datepicker_cancel"] = "ยกเลิก";
 $lang["datepicker_from"] = "From";
 $lang["datepicker_to"] = "To";
 $lang["datepicker_custom"] = "Custom";
diff --git a/application/language/th/error_lang.php b/application/language/th/error_lang.php
index bad97dc8f..425eeb17d 100644
--- a/application/language/th/error_lang.php
+++ b/application/language/th/error_lang.php
@@ -1,4 +1,4 @@
 <?php 
 
-$lang["error_no_permission_module"] = "You do not have permission to access the module named";
-$lang["error_unknown"] = "unknown";
+$lang["error_no_permission_module"] = "คุณไม่ได้รับสิทธิ์การเข้าถึงข้อมูลในส่วนนี้";
+$lang["error_unknown"] = "ไม่ทราบ";
diff --git a/application/language/th/giftcards_lang.php b/application/language/th/giftcards_lang.php
index 93cabd7c4..af13edbac 100644
--- a/application/language/th/giftcards_lang.php
+++ b/application/language/th/giftcards_lang.php
@@ -1,55 +1,55 @@
 <?php 
 
-$lang["giftcards_add_minus"] = "Inventory to add/subtract";
+$lang["giftcards_add_minus"] = "สินค้าคงคลัง เพิ่ม/ลด";
 $lang["giftcards_allow_alt_description"] = "";
-$lang["giftcards_amazon"] = "Amazon";
-$lang["giftcards_remaining_balance"] = "Giftcard %1 remaining value is %2!";
-$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_amazon"] = "อเมซอน";
+$lang["giftcards_remaining_balance"] = "บัตรของขวัญ %1 มีมูลค่า %2!";
+$lang["giftcards_bulk_edit"] = "แก้ไขเป็นกลุ่ม";
+$lang["giftcards_cannot_be_deleted"] = "ไม่สามารถลบข้อมูลบัตรของขวัญที่เลือก, หรือบัตรของขวัญได้มีการใช้ไปแล้ว";
+$lang["giftcards_cannot_find_giftcard"] = "ไม่พบข้อมูลเกี่ยวกับบัตรของขวัญนี้";
 $lang["giftcards_card_value"] = "มูลค่า";
 $lang["giftcards_category"] = "";
 $lang["giftcards_change_all_to_allow_alt_desc"] = "";
 $lang["giftcards_change_all_to_not_allow_allow_desc"] = "";
-$lang["giftcards_change_all_to_serialized"] = "Change All To Serialized";
+$lang["giftcards_change_all_to_serialized"] = "เปลี่ยนแปลงทั้งหมด";
 $lang["giftcards_change_all_to_unserialized"] = "";
 $lang["giftcards_confirm_bulk_edit"] = "";
-$lang["giftcards_confirm_delete"] = "Are you sure you want to delete the selected giftcards?";
+$lang["giftcards_confirm_delete"] = "คุณแน่ใจหรือไม่ว่าต้องการลบบัตรของขวัญที่เลือก?";
 $lang["giftcards_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_count"] = "ปรับปรุงสินค้าคงคลัง";
+$lang["giftcards_current_quantity"] = "จำนวน ณ. ปัจจุบัน";
+$lang["giftcards_description"] = "รายละเอียด";
+$lang["giftcards_details_count"] = "รายละเอียดการตรวจนับในสินค้าคงคลัง";
 $lang["giftcards_do_nothing"] = "";
 $lang["giftcards_edit_fields_you_want_to_update"] = "";
 $lang["giftcards_edit_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_generate_barcodes"] = "Generate Barcodes";
+$lang["giftcards_error_adding_updating"] = "มีข้อผิดพลาดในการ เพิ่ม/ปรับปรุง บัตรกำนัล";
+$lang["giftcards_error_updating_multiple"] = "มีข้อผิดพลาดในการปรับปรุง บัตรกำนัล";
+$lang["giftcards_excel_import_failed"] = "การส่งออกในรูปแบบไฟล์เอ็กเซล ไม่สำเร็จ";
+$lang["giftcards_generate_barcodes"] = "สร้างบาร์โค้ด";
 $lang["giftcards_giftcard"] = "บัตรกำนัล";
 $lang["giftcards_giftcard_number"] = "เลขบัตรกำนัล";
 $lang["giftcards_info_provided_by"] = "Info provided by";
-$lang["giftcards_inventory_comments"] = "Comments";
+$lang["giftcards_inventory_comments"] = "คำแนะนำ";
 $lang["giftcards_is_serialized"] = "Giftcard has Serial Number";
 $lang["giftcards_low_inventory_giftcards"] = "Low Inventory Giftcards";
 $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_must_select_giftcard_for_barcode"] = "กรุณาเลือกบัตรกำนัลอย่างน้อย 1 รายการ เพื่อสร้างบาร์โค๊ด";
 $lang["giftcards_new"] = "เพิ่มบัตรกำนัล";
 $lang["giftcards_no_description_giftcards"] = "No Description Giftcards";
 $lang["giftcards_no_giftcards_to_display"] = "No Giftcards to display";
 $lang["giftcards_none"] = "";
-$lang["giftcards_none_selected"] = "You have not selected any giftcards to edit";
+$lang["giftcards_none_selected"] = "กรุณาเลือกบัตรกำนัลที่ต้องการแก้ไข";
 $lang["giftcards_number"] = "เลขบัตรกำนัลต้องเป็นตัวเลขเท่านั้น";
 $lang["giftcards_number_information"] = "";
 $lang["giftcards_number_required"] = "ต้องกรอกเลขบัตรกำนัล";
 $lang["giftcards_one_or_multiple"] = "giftcard(s)";
 $lang["giftcards_person_id"] = "เจ้าของบัตร";
 $lang["giftcards_quantity"] = "ปริมาณ";
-$lang["giftcards_quantity_required"] = "Quantity is a required field. Please Close ( X ) to cancel";
+$lang["giftcards_quantity_required"] = "ช่องข้อมูลปริมาณ จำเป็นต้องกรอก. คลิกที่เครื่องหมาย ( X ) เพื่อยกเลิก";
 $lang["giftcards_reorder_level"] = "ยอดขั้นต่ำ";
 $lang["giftcards_retrive_giftcard_info"] = "Retrieve Giftcard Info";
-$lang["giftcards_sales_tax_1"] = "Sales Tax";
+$lang["giftcards_sales_tax_1"] = "ภาษีการขาย";
 $lang["giftcards_sales_tax_2"] = "";
 $lang["giftcards_serialized_giftcards"] = "Serialized Giftcards";
 $lang["giftcards_successful_adding"] = "You have successfully added giftcard";
diff --git a/application/language/th/items_lang.php b/application/language/th/items_lang.php
index 4ca77c23d..703945ab4 100644
--- a/application/language/th/items_lang.php
+++ b/application/language/th/items_lang.php
@@ -1,9 +1,9 @@
 <?php 
 
 $lang["items_add_minus"] = "เพิ่ม/ลบ จำนวนสินค้าคงคลัง";
-$lang["items_allow_alt_desciption"] = "Allow Alt Description";
+$lang["items_allow_alt_desciption"] = "อนุญาตให้เพิ่มรายละเอียด";
 $lang["items_allow_alt_description"] = "แสดงข้อมูลเพิ่มเติม";
-$lang["items_amazon"] = "Amazon";
+$lang["items_amazon"] = "อเมซอน";
 $lang["items_bulk_edit"] = "แก้ไขความจุ";
 $lang["items_buy_price_required"] = "ราคาซื้อขายต้องกรอก";
 $lang["items_cannot_be_deleted"] = "ไม่สามารถลบสินค้าที่เลือก, สินค้าที่เลือกถูกขายไปแล้ว.";
@@ -11,7 +11,7 @@ $lang["items_cannot_find_item"] = "ไม่พบข้อมูลของส
 $lang["items_category"] = "หมวดหมู่";
 $lang["items_category_required"] = "หมวดหมู่สินค้าต้องกรอก";
 $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_not_allow_allow_desc"] = "ไม่อนุญาตให้จัดเรียงลำดับ";
 $lang["items_change_all_to_serialized"] = "เปลี่ยนแปลงรหัสสินค้าทั้งหมด";
 $lang["items_change_all_to_unserialized"] = "ลบรหัสสินค้าทั้งหมด";
 $lang["items_confirm_bulk_edit"] = "แน่ใจหรือไม่ที่จะแก้ใขสินค้าทั้งหมดที่คุณเลือก?";
diff --git a/application/language/th/receivings_lang.php b/application/language/th/receivings_lang.php
index 8f4f3aca6..ea22e733d 100644
--- a/application/language/th/receivings_lang.php
+++ b/application/language/th/receivings_lang.php
@@ -15,14 +15,14 @@ $lang["receivings_confirm_delete"] = "";
 $lang["receivings_delete_entire_sale"] = "";
 $lang["receivings_discount"] = "ส่วนลด %";
 $lang["receivings_edit"] = "แก้ไข";
-$lang["receivings_edit_sale"] = "Edit Receiving";
-$lang["receivings_employee"] = "Employee";
+$lang["receivings_edit_sale"] = "แก้ไขรายการรับ";
+$lang["receivings_employee"] = "พนักงาน";
 $lang["receivings_error_editing_item"] = "แก้ไขสินค้าล้มเหลว";
 $lang["receivings_error_requisition"] = "";
 $lang["receivings_find_or_scan_item"] = "ค้นหาสินค้า";
 $lang["receivings_find_or_scan_item_or_receipt"] = "ค้นหาสินค้าหรือบิล";
 $lang["receivings_id"] = "รายการสินค้าเข้า ID";
-$lang["receivings_reference"] = "Reference";
+$lang["receivings_reference"] = "อ้างอิง";
 $lang["receivings_item_name"] = "ชื่อสินคัา";
 $lang["receivings_mode"] = "ประเภทธุรกรรม";
 $lang["receivings_new_supplier"] = "ผู้ผลิตรายใหม่";
diff --git a/application/language/th/reports_lang.php b/application/language/th/reports_lang.php
index 405b93f57..63653a7a4 100644
--- a/application/language/th/reports_lang.php
+++ b/application/language/th/reports_lang.php
@@ -44,7 +44,7 @@ $lang["reports_payment_type"] = "ชนิดของการจ่าย";
 $lang["reports_payments"] = "รายจ่าย";
 $lang["reports_payments_summary_report"] = "รายงานสรุปการจ่าย";
 $lang["reports_profit"] = "กำไร";
-$lang["reports_cost"] = "Cost";
+$lang["reports_cost"] = "ต้นทุน";
 $lang["reports_quantity"] = "จำนวน";
 $lang["reports_quantity_purchased"] = "จำนวนการช์้อ";
 $lang["reports_received_by"] = "รับโดย";
@@ -71,7 +71,7 @@ $lang["reports_sale_type"] = "ชนิดของการขาย";
 $lang["reports_sales"] = "ขาย";
 $lang["reports_sales_amount"] = "จำนวนขาย";
 $lang["reports_sales_summary_report"] = "รายงานสรุปการขาย";
-$lang["reports_serial_number"] = "Serial #";
+$lang["reports_serial_number"] = "เลขที่ #";
 $lang["reports_sold_by"] = "ขายโดย";
 $lang["reports_sold_to"] = "ขายไปที่";
 $lang["reports_stock_location"] = "";
diff --git a/application/language/th/sales_lang.php b/application/language/th/sales_lang.php
index ec8d9ec85..808a66e53 100644
--- a/application/language/th/sales_lang.php
+++ b/application/language/th/sales_lang.php
@@ -21,14 +21,14 @@ $lang["sales_customer_location"] = "Customer Location";
 $lang["sales_customer_discount"] = "Discount";
 $lang["sales_customer_total"] = "Total";
 $lang["sales_date"] = "วันที่ขาย";
-$lang["sales_date_required"] = "A correct date needs to be filled in";
-$lang["sales_date_type"] = "Date field is required";
+$lang["sales_date_required"] = "กรุณากรอกวันที่ให้ถูกต้อง";
+$lang["sales_date_type"] = "กรุณากรอกข้อมูลในช่องวันที่";
 $lang["sales_debit"] = "เดบิตการ์ด";
 $lang["sales_delete_confirmation"] = "แน่ใจหรือไม่ที่จะลบรายการขายนี้, ลบแล้วไม่สามารถเรียกกลับคืนใด้";
 $lang["sales_delete_entire_sale"] = "ลบการขายทั้งหมด";
 $lang["sales_delete_successful"] = "คุณลบการขายสำเร็จ";
 $lang["sales_delete_unsuccessful"] = "คุณลบการขายไม่สำเร็จ";
-$lang["sales_description_abbrv"] = "Desc";
+$lang["sales_description_abbrv"] = "รายละเอียด";
 $lang["sales_discount"] = "ส่วนลด %";
 $lang["sales_discount_included"] = "% Discount";
 $lang["sales_discount"] = "ส่วนลด";
@@ -65,7 +65,7 @@ $lang["sales_must_enter_numeric"] = "จำนวนที่ถุกประ
 $lang["sales_must_enter_numeric_giftcard"] = "กิ๊ฟการ์ด ต้องใส่ตัวเลขเท่านั้น";
 $lang["sales_new_customer"] = "ลูกค้าใหม่";
 $lang["sales_new_item"] = "สินค้าใหม่";
-$lang["sales_no_description"] = "None";
+$lang["sales_no_description"] = "ไม่มี";
 $lang["sales_no_filter"] = "All";
 $lang["sales_no_items_in_cart"] = "ไม่พบสินค้าในตระกร้า";
 $lang["sales_no_sales_to_display"] = "No sales to display";
diff --git a/application/language/tr/bootstrap_tables_lang.php b/application/language/tr/bootstrap_tables_lang.php
index 714a3cf3f..58dbc7de4 100644
--- a/application/language/tr/bootstrap_tables_lang.php
+++ b/application/language/tr/bootstrap_tables_lang.php
@@ -1,10 +1,10 @@
 <?php 
 
-$lang["tables_loading"] = "Loading, please wait...";
-$lang["tables_rows_per_page"] = "{0} rows per page";
-$lang["tables_page_from_to"] = "Showing {0} to {1} of {2} rows";
-$lang["tables_hide_show_pagination"] = "Hide/Show pagination";
-$lang["tables_refresh"] = "Refresh";
-$lang["tables_toggle"] = "Toggle";
-$lang["tables_columns"] = "Columns";
-$lang["tables_all"] = "All";
+$lang["tables_loading"] = "Yükleniyor, lütfen bekleyin...";
+$lang["tables_rows_per_page"] = "Sayfa başına {0} satır";
+$lang["tables_page_from_to"] = "{2} kayıttan {0} - {1} görüntüleniyor";
+$lang["tables_hide_show_pagination"] = "Sayfalandırmayı Gizle/Göster";
+$lang["tables_refresh"] = "Yenile";
+$lang["tables_toggle"] = "Değiştir";
+$lang["tables_columns"] = "Sütun";
+$lang["tables_all"] = "Tümü";
diff --git a/application/language/tr/common_lang.php b/application/language/tr/common_lang.php
index e7e4b485b..a35917674 100644
--- a/application/language/tr/common_lang.php
+++ b/application/language/tr/common_lang.php
@@ -3,14 +3,14 @@
 $lang["common_address_1"] = "Adres 1";
 $lang["common_address_2"] = "Adres 2";
 $lang["common_city"] = "Şehir";
-$lang["common_close"] = "Close";
+$lang["common_close"] = "Kapat";
 $lang["common_comments"] = "Yorumlar";
 $lang["common_common"] = "genel";
 $lang["common_confirm_search"] = "Birden fazla satır seçtiniz, arama yaptığınızda seçiminiz kaybolacak. Arama yapmak istediğinize emin misiniz?";
 $lang["common_country"] = "Ülke";
-$lang["common_date"] = "Date";
+$lang["common_date"] = "Tarih";
 $lang["common_delete"] = "Sil";
-$lang["common_print"] = "Print";
+$lang["common_print"] = "Yazdır";
 $lang["common_det"] = "Detaylar";
 $lang["common_edit"] = "düzenle";
 $lang["common_email"] = "E-Posta";
@@ -18,30 +18,30 @@ $lang["common_email_invalid_format"] = "E-Posta adresi doğru formatta değil";
 $lang["common_fields_required_message"] = "Kırmızı alanlar zorunludur";
 $lang["common_first_name"] = "İsim";
 $lang["common_first_name_required"] = "İsim zorunlu alandır";
-$lang["common_first_page"] = "First";
-$lang["common_gender"] = "Gender";
+$lang["common_first_page"] = "İlk";
+$lang["common_gender"] = "Cinsiyet";
 $lang["common_gender_female"] = "V";
 $lang["common_gender_male"] = "M";
 $lang["common_inv"] = "Stok";
 $lang["common_last_name"] = "Soy İsim";
 $lang["common_last_name_required"] = "Soy isim zorunlu alandır.";
-$lang["common_last_page"] = "Last";
+$lang["common_last_page"] = "Son";
 $lang["common_learn_about_project"] = " ";
 $lang["common_list_of"] = "Liste";
 $lang["common_logout"] = "Çıkış";
-$lang["common_new"] = "New";
+$lang["common_new"] = "Yeni";
 $lang["common_no_persons_to_display"] = "Gösterecek kişi yok";
-$lang["common_none_selected_text"] = "Nothing selected";
+$lang["common_none_selected_text"] = "Hiçbirşey seçilmedi";
 $lang["common_or"] = "Yada";
 $lang["common_phone_number"] = "Telefon";
 $lang["common_phone_number_required"] = "";
 $lang["common_please_visit_my"] = "ziyaret edin";
-$lang["common_powered_by"] = "Powered by";
+$lang["common_powered_by"] = "Destekleyen";
 $lang["common_price"] = "Fiyat";
 $lang["common_remove"] = "Kaldır";
 $lang["common_return_policy"] = "İade Politikası";
 $lang["common_search"] = "Arama";
-$lang["common_search_options"] = "Search options";
+$lang["common_search_options"] = "Arama seçenekleri";
 $lang["common_searched_for"] = "Ara";
 $lang["common_state"] = "Bölge";
 $lang["common_submit"] = "Onayla";
@@ -49,17 +49,17 @@ $lang["common_view_recent_sales"] = "Yeni satışları göster";
 $lang["common_website"] = "website";
 $lang["common_welcome"] = "Hoşgeldiniz";
 $lang["common_welcome_message"] = "Hoşgeldiniz, devam etmek için aşağıdan bir modül seçiniz!";
-$lang["common_you_are_using_ospos"] = "Kullandığınız sürüm";
+$lang["common_you_are_using_ospos"] = "You are using Open Source Point Of Sale Version";
 $lang["common_zip"] = "Şehir Kodu";
 $lang["common_import"] = "Import";
 $lang["common_download_import_template"] = "Download Import Excel Template (CSV)";
 $lang["common_import_excel"] = "Excel Import";
-$lang["common_import_full_path"] = "Full path to excel file required";
-$lang["common_import_select_file"] = "Select file";
-$lang["common_import_change_file"] = "Change";
-$lang["common_import_remove_file"] = "Remove";
+$lang["common_import_full_path"] = "Excel dosyası yeri";
+$lang["common_import_select_file"] = "Dosya seç";
+$lang["common_import_change_file"] = "Değiştir";
+$lang["common_import_remove_file"] = "Kaldır";
 $lang["common_export_excel"] = "Excel Export";
-$lang["common_export_excel_yes"] = "Yes";
+$lang["common_export_excel_yes"] = "Evet";
 $lang["common_export_excel_no"] = "No";
-$lang["common_required"] = "Required";
+$lang["common_required"] = "Zorunlu";
 $lang["common_id"] = "Id";
diff --git a/application/language/tr/customers_lang.php b/application/language/tr/customers_lang.php
index b4ac23a87..287d62164 100644
--- a/application/language/tr/customers_lang.php
+++ b/application/language/tr/customers_lang.php
@@ -1,12 +1,12 @@
 <?php 
 
 $lang["customers_account_number"] = "Hesap No";
-$lang["customers_account_number_duplicate"] = "This account number is already present in the database";
+$lang["customers_account_number_duplicate"] = "Bu hesap numarası zaten var";
 $lang["customers_cannot_be_deleted"] = "Seçili müşteriler silinemedi, müşterilerin satışları var.";
-$lang["customers_company_name"] = "Company";
+$lang["customers_company_name"] = "Şirket";
 $lang["customers_confirm_delete"] = "Seçili müşteriyi silmek istediğinize emin misiniz?";
 $lang["customers_customer"] = "Müşteri";
-$lang["customers_discount"] = "Discount";
+$lang["customers_discount"] = "İndirim";
 $lang["customers_error_adding_updating"] = "Müşteri ekleme/güncelleme hatası";
 $lang["customers_new"] = "Yeni Müşteri";
 $lang["customers_none_selected"] = "Silmek için müşteri seçmediniz";
@@ -15,10 +15,10 @@ $lang["customers_successful_adding"] = "Müşteri eklendi";
 $lang["customers_successful_deleted"] = "Silme başarılı";
 $lang["customers_successful_updating"] = "Müşteri güncellendi";
 $lang["customers_taxable"] = "Vergilendirilebilir";
-$lang["customers_total"] = "Total";
+$lang["customers_total"] = "Toplam";
 $lang["customers_update"] = "Müşteri Güncelle";
-$lang["customers_import_items_excel"] = "Import customers from Excel sheet";
+$lang["customers_import_items_excel"] = "Müşterileri Excel sayfasından aktar";
 $lang["customers_excel_import_failed"] = "Excel aktarım hatası";
-$lang["customers_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or wrong format";
-$lang["customers_excel_import_success"] = "Import of Customers successful";
+$lang["customers_excel_import_nodata_wrongformat"] = "Yüklenen dosya herhangi bir veri içermiyor veya hatalı formatta";
+$lang["customers_excel_import_success"] = "Müşteri aktarımı başarılı";
 $lang["customers_excel_import_partially_failed"] = "Most Customers imported. But some were not, here is the list";
diff --git a/application/language/tr/giftcards_lang.php b/application/language/tr/giftcards_lang.php
index 51b5da73e..f69c57af8 100644
--- a/application/language/tr/giftcards_lang.php
+++ b/application/language/tr/giftcards_lang.php
@@ -1,23 +1,23 @@
 <?php 
 
-$lang["giftcards_add_minus"] = "Inventory to add/subtract";
-$lang["giftcards_allow_alt_description"] = "Allow Alt Description";
+$lang["giftcards_add_minus"] = "Eklenen/Çıkarılan Adet";
+$lang["giftcards_allow_alt_description"] = "Dip Nota izin ver";
 $lang["giftcards_amazon"] = "Amazon";
-$lang["giftcards_remaining_balance"] = "Giftcard %1 remaining value is %2!";
-$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_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_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_count"] = "Update Inventory";
-$lang["giftcards_current_quantity"] = "Current Quantity";
+$lang["giftcards_remaining_balance"] = "Hediye Çeki %1 kalan miktar %2!";
+$lang["giftcards_bulk_edit"] = "Çoklu Düzenleme";
+$lang["giftcards_cannot_be_deleted"] = "Seçili Hediye Çekleri silinemedi, bir veya fazla Hediye Çekinde satış bulunmaktadır.";
+$lang["giftcards_cannot_find_giftcard"] = "Hediye Çekine ait bilgi bulunamadı";
+$lang["giftcards_card_value"] = "Miktar";
+$lang["giftcards_category"] = "Kategori";
+$lang["giftcards_change_all_to_allow_alt_desc"] = "Tümünde dipnota izin ver";
+$lang["giftcards_change_all_to_not_allow_allow_desc"] = "Tümünde dipnota izin verme";
+$lang["giftcards_change_all_to_serialized"] = "Tümünü seri numaralı yap";
+$lang["giftcards_change_all_to_unserialized"] = "Tümünü seri numarasız yap";
+$lang["giftcards_confirm_bulk_edit"] = "Seçili Hediye Çeklerini düzeltmek istiyormusunuz?";
+$lang["giftcards_confirm_delete"] = "Seçili Hediye Çeklerini silmek istediğinizden eminmisiniz?";
+$lang["giftcards_cost_price"] = "Maliyet Fiyatı";
+$lang["giftcards_count"] = "Stoğu Güncelle";
+$lang["giftcards_current_quantity"] = "Mevcut Miktar";
 $lang["giftcards_description"] = "Description";
 $lang["giftcards_details_count"] = "Inventory Count Details";
 $lang["giftcards_do_nothing"] = "Do Nothing";
diff --git a/application/language/tr/items_lang.php b/application/language/tr/items_lang.php
index d390de6e9..7534c86bf 100644
--- a/application/language/tr/items_lang.php
+++ b/application/language/tr/items_lang.php
@@ -15,7 +15,7 @@ $lang["items_change_all_to_not_allow_allow_desc"] = "Tümünde dip nota izin ver
 $lang["items_change_all_to_serialized"] = "Tümünü seri numaralı yap";
 $lang["items_change_all_to_unserialized"] = "Tümünü seri numarasız yap";
 $lang["items_confirm_bulk_edit"] = "Seçili tüm ürünleri düzenlemek istediğinize emin misiniz?";
-$lang["items_confirm_bulk_edit_wipe_taxes"] = "All item tax information will be replaced!";
+$lang["items_confirm_bulk_edit_wipe_taxes"] = "Tüm ürün vergi bilgileri değiştirilecektir !";
 $lang["items_confirm_delete"] = "Seçili ürünleri silmek istediğinize emin misiniz?";
 $lang["items_cost_price"] = "Maliyet Fiyatı";
 $lang["items_cost_price_number"] = "Fiyat sayı olmalıdır (9.90)";
@@ -30,9 +30,9 @@ $lang["items_edit_multiple_items"] = "Çoklu Ürün Güncelleme";
 $lang["items_error_adding_updating"] = "Ürün ekleme/düzenleme hatası";
 $lang["items_error_updating_multiple"] = "Ürün düzenleme hatası";
 $lang["items_excel_import_failed"] = "Excel aktarım hatası";
-$lang["items_excel_import_nodata_wrongformat"] = "Your uploaded file has no data or wrong format";
-$lang["items_excel_import_success"] = "Import of Items successful";
-$lang["items_excel_import_partially_failed"] = "Most Items imported. But some were not, here is the list";
+$lang["items_excel_import_nodata_wrongformat"] = "Yüklenen dosya herhangi bir veri içermiyor veya hatalı formatta";
+$lang["items_excel_import_success"] = "Ürün aktarımı başarılı";
+$lang["items_excel_import_partially_failed"] = "Bazı ürünler aktarılamadı. Aktarılamayanlar listesi";
 $lang["items_generate_barcodes"] = "Barkod Üret";
 $lang["items_image"] = "Avatar";
 $lang["items_info_provided_by"] = "Bilgi sağlayan";
@@ -42,9 +42,9 @@ $lang["items_is_deleted"] = "Silinmiş";
 $lang["items_is_serialized"] = "Seri Numaralı Ürün";
 $lang["items_item"] = "Ürün";
 $lang["items_item_number"] = "UPC/EAN/ISBN";
-$lang["items_item_number_duplicate"] = "The item number is already present in the database";
+$lang["items_item_number_duplicate"] = "Ürün numarası veritabanında zaten var";
 $lang["items_location"] = "Yer";
-$lang["items_empty_upc_items"] = "Empty UPC Items";
+$lang["items_empty_upc_items"] = "Ürün kodu olmayan ürünler";
 $lang["items_low_inventory_items"] = "";
 $lang["items_manually_editing_of_quantity"] = "Elle adet düzeltme";
 $lang["items_name"] = "Ürün Adı";
@@ -55,12 +55,12 @@ $lang["items_no_items_to_display"] = "Gösterecek Ürün Yok";
 $lang["items_none"] = "Hiçbiri";
 $lang["items_none_selected"] = "Düzenlemek için ürün seçmediniz";
 $lang["items_number_information"] = "Ürün No";
-$lang["items_number_required"] = "UPC/EAN/ISBN is a required field";
+$lang["items_number_required"] = "UPC/EAN/ISBN alanı zorunludur";
 $lang["items_one_or_multiple"] = "ürün";
 $lang["items_quantity"] = "Adet";
 $lang["items_quantity_number"] = "Adet sayı olmalıdır";
 $lang["items_quantity_required"] = "Adet zorunlu alandır";
-$lang["items_receiving_quantity"] = "Receiving quantity";
+$lang["items_receiving_quantity"] = "Alım miktarı";
 $lang["items_reorder_level"] = "Düşük Stok";
 $lang["items_reorder_level_number"] = "Düşük stok sayı olmalıdır";
 $lang["items_reorder_level_required"] = "Düşük Stok zorunlu alandır";
@@ -86,7 +86,7 @@ $lang["items_unit_price_required"] = "Satış Fiyatı zorunlu alandır";
 $lang["items_upc_database"] = "UPC Veritabanı";
 $lang["items_update"] = "Ürün Güncelle";
 $lang["items_use_inventory_menu"] = "Stok Menüsünü Kullan";
-$lang["items_import_items_excel"] = "Import items from Excel sheet";
-$lang["items_select_image"] = "Select Image";
-$lang["items_change_image"] = "Change Image";
-$lang["items_remove_image"] = "Remove Image";
+$lang["items_import_items_excel"] = "Excel dosyasından ürün aktar";
+$lang["items_select_image"] = "Resim Seç";
+$lang["items_change_image"] = "Resmi değiştir";
+$lang["items_remove_image"] = "Resmi kaldır";
diff --git a/application/language/tr/messages_lang.php b/application/language/tr/messages_lang.php
index ed1f113a8..7eaf37835 100644
--- a/application/language/tr/messages_lang.php
+++ b/application/language/tr/messages_lang.php
@@ -1,14 +1,14 @@
 <?php 
 
 $lang["messages_sms_send"] = "Send SMS";
-$lang["messages_first_name"] = "First name";
-$lang["messages_last_name"] = "Last name";
-$lang["messages_phone"] = "Phone number";
-$lang["messages_phone_placeholder"] = "Mobile Number(s) here...";
-$lang["messages_phone_number_required"] = "Phone number required";
-$lang["messages_message"] = "Message";
-$lang["messages_message_placeholder"] = "Your Message here...";
-$lang["messages_message_required"] = "Message required";
-$lang["messages_multiple_phones"] = "(In case of multiple recipients, enter mobile numbers separated by commas)";
-$lang["messages_successfully_sent"] = "Message successfully sent to: ";
-$lang["messages_unsuccessfully_sent"] = "Message unsuccessfully sent to: ";
+$lang["messages_first_name"] = "İsim";
+$lang["messages_last_name"] = "Soyisim";
+$lang["messages_phone"] = "Telefon Numarası";
+$lang["messages_phone_placeholder"] = "Mobil numaralar...";
+$lang["messages_phone_number_required"] = "Telefon numarası giriniz";
+$lang["messages_message"] = "Mesaj";
+$lang["messages_message_placeholder"] = "Mesajınız...";
+$lang["messages_message_required"] = "Mesaj giriniz";
+$lang["messages_multiple_phones"] = "(Birden fazla alıcı için telefon numaralarını virgül ile ayırınız)";
+$lang["messages_successfully_sent"] = "Mesaj başarıyla gönderildi : ";
+$lang["messages_unsuccessfully_sent"] = "Mesaj gönderilemedi. Alıcı : ";
diff --git a/application/language/tr/sales_lang.php b/application/language/tr/sales_lang.php
index ca908495c..a8f0515fb 100644
--- a/application/language/tr/sales_lang.php
+++ b/application/language/tr/sales_lang.php
@@ -66,7 +66,7 @@ $lang["sales_must_enter_numeric_giftcard"] = "Hediye çeki numarası için sayı
 $lang["sales_new_customer"] = "Yeni Müşteri";
 $lang["sales_new_item"] = "Yeni Ürün";
 $lang["sales_no_description"] = "None";
-$lang["sales_no_filter"] = "All";
+$lang["sales_no_filter"] = "Tümü";
 $lang["sales_no_items_in_cart"] = "Sepette Ürün Yok";
 $lang["sales_no_sales_to_display"] = "No sales to display";
 $lang["sales_one_or_multiple"] = "";
diff --git a/application/language/zh/config_lang.php b/application/language/zh/config_lang.php
index a4a6aa0d8..67b185591 100755
--- a/application/language/zh/config_lang.php
+++ b/application/language/zh/config_lang.php
@@ -165,7 +165,7 @@ $lang["config_saved_successfully"] = "組態設置儲存成功";
 $lang["config_saved_unsuccessfully"] = "組態設置儲存失敗";
 $lang["config_statistics"] = "Send statistics";
 $lang["config_statistics_tooltip"] = "Send statistics for development and feature improvement purposes";
-$lang["config_stock_location"] = "Stock location";
+$lang["config_stock_location"] = "倉庫地址";
 $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 number is a required field";
diff --git a/application/language/zh/items_lang.php b/application/language/zh/items_lang.php
index 14bcce551..3d34eb7e9 100755
--- a/application/language/zh/items_lang.php
+++ b/application/language/zh/items_lang.php
@@ -69,7 +69,7 @@ $lang["items_sales_tax_1"] = "營業稅";
 $lang["items_sales_tax_2"] = "營業稅 2";
 $lang["items_search_custom_items"] = "Search Custom Fields";
 $lang["items_serialized_items"] = "序列化產品";
-$lang["items_stock_location"] = "Stock location";
+$lang["items_stock_location"] = "倉庫地址";
 $lang["items_successful_adding"] = "已成功新增產品";
 $lang["items_successful_bulk_edit"] = "您已成功更新所選產品";
 $lang["items_successful_deleted"] = "刪除成功";
diff --git a/application/language/zh/receivings_lang.php b/application/language/zh/receivings_lang.php
index 0273031d5..88ef22b3d 100755
--- a/application/language/zh/receivings_lang.php
+++ b/application/language/zh/receivings_lang.php
@@ -38,7 +38,7 @@ $lang["receivings_return"] = "退貨";
 $lang["receivings_select_supplier"] = "選擇供應商 (Optional)";
 $lang["receivings_start_typing_supplier_name"] = "開始輸入供應商名稱...";
 $lang["receivings_stock_destination"] = "Stock destination";
-$lang["receivings_stock_locaiton"] = "Stock location";
+$lang["receivings_stock_locaiton"] = "倉庫地址";
 $lang["receivings_stock_source"] = "Stock source";
 $lang["receivings_successfully_deleted"] = "You have successfully deleted";
 $lang["receivings_successfully_updated"] = "Receiving successfully updated";
diff --git a/docker-cloud.yml b/docker-cloud.yml
index a398eed26..baac1393b 100644
--- a/docker-cloud.yml
+++ b/docker-cloud.yml
@@ -11,6 +11,7 @@ web:
     volumes:
         - /app/uploads
     environment:
+        - PHP_TIMEZONE=UTC
         - MYSQL_USERNAME=admin
         - MYSQL_PASSWORD=pointofsale
         - MYSQL_DB_NAME=ospos
diff --git a/docker-compose.yml b/docker-compose.yml
index edde4ab15..1603bcfc5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -20,6 +20,7 @@ services:
         volumes:
             - .:/app
         environment:
+            - PHP_TIMEZONE=UTC
             - MYSQL_USERNAME=admin
             - MYSQL_PASSWORD=pointofsale
             - MYSQL_DB_NAME=ospos