Merge branch 'develop' of https://github.com/frappe/erpnext into develop
diff --git a/erpnext/templates/includes/cart/cart_address.html b/erpnext/templates/includes/cart/cart_address.html
index d83f609..7bd9256 100644
--- a/erpnext/templates/includes/cart/cart_address.html
+++ b/erpnext/templates/includes/cart/cart_address.html
@@ -15,7 +15,7 @@
{{ _("Manage Addresses") }}</a>
</div>
<div class="col-sm-6">
- <div class="h6 text-uppercase">Billing Address</div>
+ <div class="h6 text-uppercase">{{ _("Billing Address") }}</div>
<div id="cart-billing-address" class="panel-group"
data-fieldname="customer_address">
{% for address in billing_addresses %}
diff --git a/erpnext/templates/pages/cart.html b/erpnext/templates/pages/cart.html
index 7f6bf01..6cff5b1 100644
--- a/erpnext/templates/pages/cart.html
+++ b/erpnext/templates/pages/cart.html
@@ -1,6 +1,6 @@
{% extends "templates/web.html" %}
-{% block title %} {{ "Shopping Cart" }} {% endblock %}
+{% block title %} {{ _("Shopping Cart") }} {% endblock %}
{% block header %}<h2>{{ _("My Cart") }}</h2>{% endblock %}