From fc8e63ae985c1a94843d028a239869ba07e67d34 Mon Sep 17 00:00:00 2001
From: drago-aca <d.kovacevic@aca-gmbh.de>
Date: Thu, 29 Nov 2018 11:23:54 +0100
Subject: [PATCH 1/2] Update shipping.phtml

Wrong translation field fix
---
 .../rwd/default/template/checkout/onepage/shipping.phtml      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
index 2535699309b..9ca49c7235c 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
@@ -50,7 +50,7 @@
                     </li>
             <?php $_streetValidationClass = $this->helper('customer/address')->getAttributeValidationClass('street'); ?>
                     <li class="wide">
-                        <label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Address') ?></label>
+                        <label for="shipping:street1" class="required"><em>*</em><?php echo $this->__('Street Address') ?></label>
                         <div class="input-box">
                             <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address')) ?>" name="shipping[street][]" id="shipping:street1" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet(1)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
                         </div>
@@ -58,7 +58,7 @@
             <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
             <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
                     <li class="wide">
-                        <label for="shipping:street<?php echo $_i ?>"><?php echo $this->__('Address') ?> <?php echo $_i ?></label>
+                        <label for="shipping:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i)) ?> <?php echo $_i ?></label>
                         <div class="input-box">
                             <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address %s', $_i)) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
                         </div>

From 77dde223dd1e689752ce4fb3b9569bf4781219dc Mon Sep 17 00:00:00 2001
From: sv3n <github-sr@hotmail.com>
Date: Sat, 22 Aug 2020 23:26:11 +0200
Subject: [PATCH 2/2] Fixed typo

---
 .../rwd/default/template/checkout/onepage/shipping.phtml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
index 9ca49c7235c..85e9c287aa9 100644
--- a/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
+++ b/app/design/frontend/rwd/default/template/checkout/onepage/shipping.phtml
@@ -58,7 +58,7 @@
             <?php $_streetValidationClass = trim(str_replace('required-entry', '', $_streetValidationClass)); ?>
             <?php for ($_i = 2, $_n = $this->helper('customer/address')->getStreetLines(); $_i <= $_n; $_i++): ?>
                     <li class="wide">
-                        <label for="shipping:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i)) ?> <?php echo $_i ?></label>
+                        <label for="shipping:street<?php echo $_i ?>"><?php echo $this->__('Street Address %s', $_i) ?> <?php echo $_i ?></label>
                         <div class="input-box">
                             <input type="text" title="<?php echo Mage::helper('core')->quoteEscape($this->__('Street Address %s', $_i)) ?>" name="shipping[street][]" id="shipping:street<?php echo $_i ?>" value="<?php echo $this->escapeHtml($this->getAddress()->getStreet($_i)) ?>" class="input-text <?php echo $_streetValidationClass ?>" onchange="shipping.setSameAsBilling(false);" />
                         </div>