diff --git a/application/language/en/config_lang.php b/application/language/en/config_lang.php
index 38d542d11..c1daada45 100644
--- a/application/language/en/config_lang.php
+++ b/application/language/en/config_lang.php
@@ -82,7 +82,7 @@ $lang["config_barcode_price"] = "Price";
 $lang["config_barcode_company"] = "Company Name";
 $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?";
+$lang["config_logout"] = "Don't you want to make a backup before logging out? Click [OK] to backup, [Cancel] to logout";
 $lang["config_backup_database"] = "Backup Database";
 $lang["config_backup_button"] = "Backup";
 $lang["config_stock_location_invalid_chars"] = "The stock location name can not contain '_'";
diff --git a/application/language/en/receivings_lang.php b/application/language/en/receivings_lang.php
index d3fea8334..538b6fcd4 100644
--- a/application/language/en/receivings_lang.php
+++ b/application/language/en/receivings_lang.php
@@ -37,7 +37,7 @@ $lang["recvs_register"] = "Items Receiving";
 $lang["recvs_requisition"] = "Requisition";
 $lang["recvs_return"] = "Return";
 $lang["recvs_select_supplier"] = "Select Supplier (Optional)";
-$lang["recvs_start_typing_supplier_name"] = "Start Typing supplier\'s name...";
+$lang["recvs_start_typing_supplier_name"] = "Start Typing supplier's name...";
 $lang["recvs_stock_destination"] = "Stock destination";
 $lang["recvs_stock_locaiton"] = "Stock location";
 $lang["recvs_stock_source"] = "Stock source";
diff --git a/application/language/fr/receivings_lang.php b/application/language/fr/receivings_lang.php
index fb16599be..5193e638e 100644
--- a/application/language/fr/receivings_lang.php
+++ b/application/language/fr/receivings_lang.php
@@ -1,6 +1,6 @@
 <?php 
 
-$lang["receivings_transaction_failed"] = "Échec d\'opération d\'arrivage";
+$lang["receivings_transaction_failed"] = "Échec d'opération d'arrivage";
 $lang["recvs_basic_information"] = "";
 $lang["recvs_cancel_receiving"] = "";
 $lang["recvs_cannot_be_deleted"] = "";
@@ -18,14 +18,14 @@ $lang["recvs_discount"] = "Remise %";
 $lang["recvs_edit"] = "Éditer";
 $lang["recvs_edit_sale"] = "";
 $lang["recvs_employee"] = "";
-$lang["recvs_error_editing_item"] = "Erreur d\'édition";
+$lang["recvs_error_editing_item"] = "Erreur d'édition";
 $lang["recvs_error_requisition"] = "";
 $lang["recvs_find_or_scan_item"] = "Chercher/Scanner Élément";
 $lang["recvs_find_or_scan_item_or_receipt"] = "Chercher Elément OU Recu";
 $lang["recvs_id"] = "ID Arrivage";
 $lang["recvs_invoice_number"] = "";
 $lang["recvs_invoice_number_duplicate"] = "";
-$lang["recvs_item_name"] = "Nom d\'Élément";
+$lang["recvs_item_name"] = "Nom d'Élément";
 $lang["recvs_mode"] = "Receiving Mode";
 $lang["recvs_new_supplier"] = "Nouveau Fournisseur";
 $lang["recvs_one_or_multiple"] = "";
@@ -45,6 +45,6 @@ $lang["recvs_successfully_deleted"] = "";
 $lang["recvs_successfully_updated"] = "";
 $lang["recvs_supplier"] = "Fournisseur";
 $lang["recvs_total"] = "Total";
-$lang["recvs_unable_to_add_item"] = "Impossible d\'ajouter l\'item aux arrivages";
+$lang["recvs_unable_to_add_item"] = "Impossible d'ajouter l'item aux arrivages";
 $lang["recvs_unsuccessfully_updated"] = "";
 $lang["recvs_invoice_enable"] = "";
diff --git a/translations/config_lang.csv b/translations/config_lang.csv
index ad73888a7..ca851e9c5 100644
--- a/translations/config_lang.csv
+++ b/translations/config_lang.csv
@@ -81,7 +81,7 @@ config_barcode_price,Prijs,Price,Price,Price,Price,Price,Price,Price,Price
 config_barcode_company,Bedrijfsnaam,Nombre del Comercio,Company Name,Nome de l\'Entreprise,公司名稱,Название Компании,ชื่อร้านค้า,Şirket Adı,Nama Perusahaan
 config_location_configuration,Stock Locaties,Stock Locations,Stock Locations,Stock Locations,Stock Locations,Stock Locations,Stock Locations,Stock Locations,Stock Locations
 config_location_info,Instellingen Locatie,Location Configuration Information,Location Configuration Information,Location Configuration Information,Location Configuration Information,Location Configuration Information,Location Configuration Information,Location Configuration Information,Location Configuration Information
-config_logout,Wilt u een backup maken alvorens uit te loggen?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?
+config_logout,Wilt u een backup maken alvorens uit te loggen?,Don't you want to make a backup before logging out?,"Don't you want to make a backup before logging out? Click [OK] to backup, [Cancel] to logout",Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?,Don't you want to make a backup before logging out?
 config_backup_database,Backup Database,Backup Database,Backup Database,Backup Database,Backup Database,Backup Database,Backup Database,Backup Database,Backup Database
 config_backup_button,Backup,Backup,Backup,Backup,Backup,Backup,Backup,Backup,Backup
 config_stock_location_invalid_chars,De bedrijfsnaam moet ingevuld worden,The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_',The stock location name can not contain '_'
diff --git a/translations/receivings_lang.csv b/translations/receivings_lang.csv
index b40b30526..e4fc67be7 100644
--- a/translations/receivings_lang.csv
+++ b/translations/receivings_lang.csv
@@ -1,5 +1,5 @@
 "label","nl-BE","es","en","fr","zh","ru","th","tr","id"
-"receivings_transaction_failed","Order transactie mislukt","Las Transacciones de Entrada Fallaron","Receivings Transactions Failed","Échec d\'opération d\'arrivage","進貨交易失敗","Ошибка Получение транзакции","ดำเนินการรับสินค้าล้มเหลว","Alım İşlemi Hatası","Transaksi Penerimaan Salah"
+"receivings_transaction_failed","Order transactie mislukt","Las Transacciones de Entrada Fallaron","Receivings Transactions Failed","Échec d'opération d'arrivage","進貨交易失敗","Ошибка Получение транзакции","ดำเนินการรับสินค้าล้มเหลว","Alım İşlemi Hatası","Transaksi Penerimaan Salah"
 "recvs_basic_information","","","Receiving information","","","","","",""
 "recvs_cancel_receiving","","","Cancel","","","","","",""
 "recvs_cannot_be_deleted","","","Receiving(s) could not be deleted","","","","","",""
@@ -17,14 +17,14 @@
 "recvs_edit","Bewerk","Editar","Edit","Éditer","編輯","редактировать","แก้ไข","Düzenle","Ubah"
 "recvs_edit_sale","","","Edit Receiving","","","","","",""
 "recvs_employee","","","Employee","","","","","",""
-"recvs_error_editing_item","Fout bij het bewerken product","Error al editar artículo","Error editing item","Erreur d\'édition","產品編輯錯誤","Ошибка редактирования товар","แก้ไขสินค้าล้มเหลว","Ürün düzenleme hatası","Pengubahan Item Salah"
+"recvs_error_editing_item","Fout bij het bewerken product","Error al editar artículo","Error editing item","Erreur d'édition","產品編輯錯誤","Ошибка редактирования товар","แก้ไขสินค้าล้มเหลว","Ürün düzenleme hatası","Pengubahan Item Salah"
 "recvs_error_requisition","","","Unable to move inventory from and to the same stock location","","","","","Ürün aynı yere taşınamaz",""
 "recvs_find_or_scan_item","Zoek/Scan Product","Encontrar/Escanear Artículo","Find/Scan Item","Chercher/Scanner Élément","查找 / 掃描產品","Найти/Сканировать товар","ค้นหาสินค้า","Ürün Bul/Oku","Cari/Scan Item"
 "recvs_find_or_scan_item_or_receipt","Zoek/Scan Product OF Tickets","Encontrar/Escanear Artículo o Entrada","Find/Scan Item OR Receipt","Chercher Elément OU Recu","查找 / 掃描產品或收據","Найти/Сканировать товар ИЛИ квитанция","ค้นหาสินค้าหรือบิล","Ürün yada Fatura Bul/Oku","Cari/Scan Item ATAU Faktur"
 "recvs_id","Ordernummer","ID de Entrada","Receiving ID","ID Arrivage","進貨編號","получение ID","รายการสินค้าเข้า ID","Alım No","ID Penerimaan"
 "recvs_invoice_number","","","Invoice #","","","","","",""
 "recvs_invoice_number_duplicate","","","Please enter an unique invoice number","","","","","",""
-"recvs_item_name","Productnaam","Nombre del Artículo","Item Name","Nom d\'Élément","產品名稱","Название товара","ชื่อสินคัา","Ürün Adı","Nama Item"
+"recvs_item_name","Productnaam","Nombre del Artículo","Item Name","Nom d'Élément","產品名稱","Название товара","ชื่อสินคัา","Ürün Adı","Nama Item"
 "recvs_mode","Order type","Modo de Entradas","Receiving Mode","Receiving Mode","進貨模式","получая режим","วิธีการรับสินค้า","Alım Türü","Jenis Penerimaan"
 "recvs_new_supplier","N. Leverancier","Nuevo Proveedor","New Supplier","Nouveau Fournisseur","新供應商","Новый поставщик","ผู้ผลิตรายใหม่","Yeni Sağlayıcı","Pemasok Baru"
 "recvs_one_or_multiple","","","receiving(s)","","","","","",""
@@ -36,7 +36,7 @@
 "recvs_requisition","","","Requisition","","","","เบิกสินค้า","Talepler",""
 "recvs_return","Teruggave","Devolver","Return","Return","退貨","возвращать","คืน","İade","Retur"
 "recvs_select_supplier","Selecteer Leverancier (Optioneel)","Seleccionar Proveedor (Opcional)","Select Supplier (Optional)","Choisir Fournisseur (Facultatif)","選擇供應商 (Optional)","Выберите поставщика (необязательно)","เลือกผู้ผลิต (ทางเลือก)","Sağlayıcı Seç (İsteğe Bağlı)","Pilih Pemasok (Opsional)"
-"recvs_start_typing_supplier_name","Typ naam leverancier..","Empieza a escribir el nombre del proveedor...","Start Typing supplier\'s name...","Commencez à saisir le nom du fournisseur...","開始輸入供應商名稱...","Начните вводить название поставщика...","เริ่มต้นพิมพ์ชื่อผู้ผลิต...","Sağlayıcı Adı...","Ketik nama pemasok ..."
+"recvs_start_typing_supplier_name","Typ naam leverancier..","Empieza a escribir el nombre del proveedor...","Start Typing supplier's name...","Commencez à saisir le nom du fournisseur...","開始輸入供應商名稱...","Начните вводить название поставщика...","เริ่มต้นพิมพ์ชื่อผู้ผลิต...","Sağlayıcı Adı...","Ketik nama pemasok ..."
 "recvs_stock_destination","","","Stock destination","","","","","Stok hedefi",""
 "recvs_stock_locaiton","","","Stock location","","","","","Stok yeri",""
 "recvs_stock_source","","","Stock source","","","","","Stok kaynağı",""
@@ -44,6 +44,6 @@
 "recvs_successfully_updated","","","Receiving successfully updated","","","","","",""
 "recvs_supplier","Leverancier","Proveedor","Supplier","Fournisseur","供應商","поставщик","ผู้ผลิต","Sağlayıcı","Pemasok"
 "recvs_total","Totaal","Total","Total","Total","總數量","сумма","รวม","Toplam","Total"
-"recvs_unable_to_add_item","Onmogelijk om product aan order toe te voegen","No se puede agregar el artículo a la entrada","Unable to add item to receiving","Impossible d\'ajouter l\'item aux arrivages","無法新增進貨資料","Невозможно добавить товар на получение","ไม่สามารถเพิ่มสินค้าได้","Ürünler alıma eklenemedi","Item tidak dapat ditambahkan ke penerimaan barang masuk"
+"recvs_unable_to_add_item","Onmogelijk om product aan order toe te voegen","No se puede agregar el artículo a la entrada","Unable to add item to receiving","Impossible d'ajouter l'item aux arrivages","無法新增進貨資料","Невозможно добавить товар на получение","ไม่สามารถเพิ่มสินค้าได้","Ürünler alıma eklenemedi","Item tidak dapat ditambahkan ke penerimaan barang masuk"
 "recvs_unsuccessfully_updated","","","Receiving unsuccessfully updated","","","","","",""
 "recvs_invoice_enable","Maak Factuur","","Create Invoice","","","","","",""
\ No newline at end of file