Merge remote-tracking branch 'upstream/master'
This commit is contained in:
@@ -480,7 +480,7 @@
|
||||
"user.shipping_address":"USA SHIPPING ADDRESS",
|
||||
"user.deliveryAddress":"My delivery address",
|
||||
"user.buying_instruction":"See below instructions to add USA shipping address while shoping online",
|
||||
"user.form.shipping_address":"SHIPPING ADDRESS",
|
||||
"user.form.shipping_address":"ADDRESS",
|
||||
|
||||
"buy_online":"Buying Instructions",
|
||||
"buy_online.title":"BUYING INSTRUCTIONS",
|
||||
@@ -498,11 +498,11 @@
|
||||
"staff.add":"Add",
|
||||
"staff.update":"Update",
|
||||
|
||||
"shipment.title":"Shipments",
|
||||
"shipment.list.title":"SHIPMENTS",
|
||||
"shipment.add":"New shipment",
|
||||
"shipment.form.title":"SHIPMENT",
|
||||
"shipment.number":"Shipment number",
|
||||
"shipment.title":"FCS Shipments",
|
||||
"shipment.list.title":"FCS SHIPMENTS",
|
||||
"shipment.add":"New FCS shipment",
|
||||
"shipment.form.title":"FCS SHIPMENT",
|
||||
"shipment.number":"FCS Shipment Number",
|
||||
|
||||
"pickup": "Shipments",
|
||||
"pickup.title": "SHIPMENTS",
|
||||
@@ -590,13 +590,16 @@
|
||||
"total.amount": "Amount :",
|
||||
|
||||
"payment.method.btn":"Payment Methods",
|
||||
"payment.method.title":"Payment Methods",
|
||||
"payment.method.new":"Payment Method",
|
||||
"payment.method.title":"PAYMENT METHODS",
|
||||
"payment.method.new":"New Payment Method",
|
||||
"payment.method.form":"PAYMENT METHOD",
|
||||
|
||||
"discount.btn":"Discounts",
|
||||
"discount.title":"Discounts",
|
||||
"discount.new":"DISCOUNT",
|
||||
"discount.title":"DISCOUNTS",
|
||||
"discount.new":"New Discount",
|
||||
"discount.form":"DISCOUNT",
|
||||
|
||||
"custom.form.title":"CUSTOM"
|
||||
"custom.form.title":"CUSTOM",
|
||||
"shipping_addresses": "ADDRESSES"
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user