Version Notes
1.8.1.0
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Mage_Locale_en_US |
| Version | 1.8.1.0 |
| Comparing to | |
| See all releases | |
Code changes from version 1.8.0.0 to 1.8.1.0
- app/locale/en_US/Mage_AmazonPayments.csv +101 -0
- app/locale/en_US/Mage_Authorizenet.csv +1 -0
- app/locale/en_US/Mage_Bundle.csv +13 -0
- app/locale/en_US/Mage_Core.csv +1 -1
- app/locale/en_US/Mage_CurrencySymbol.csv +2 -2
- app/locale/en_US/Mage_GoogleAnalytics.csv +1 -0
- app/locale/en_US/Mage_ImportExport.csv +43 -13
- app/locale/en_US/Mage_Page.csv +0 -1
- app/locale/en_US/Mage_Sales.csv +4 -1
- app/locale/en_US/Mage_Tax.csv +1 -0
- app/locale/en_US/Mage_Usa.csv +0 -3
- app/locale/en_US/Mage_Weee.csv +4 -1
- app/locale/en_US/template/email/payment_failed.html +1 -4
- app/locale/en_US/template/email/product_share.html +5 -14
- app/locale/en_US/template/email/token.html +1 -9
- package.xml +5 -5
app/locale/en_US/Mage_AmazonPayments.csv
ADDED
|
@@ -0,0 +1,101 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
" Select Shipping Method"," Select Shipping Method"
|
| 2 |
+
"<br/>Trace confirmation request:<br/>%s","<br/>Trace confirmation request:<br/>%s"
|
| 3 |
+
"Access Key","Access Key"
|
| 4 |
+
"Access Key ID","Access Key ID"
|
| 5 |
+
"Amazon Simple Pay","Amazon Simple Pay"
|
| 6 |
+
"Amazon Simple Pay notification error","Amazon Simple Pay notification error"
|
| 7 |
+
"Amazon Simple Pay service capture confirmation error: confirmation request amount is not equal to the amount of order.","Amazon Simple Pay service capture confirmation error: confirmation request amount is not equal to the amount of order."
|
| 8 |
+
"Amazon Simple Pay service capture confirmation error: the amount in the existing invoice does not match the amount in the confirmation request.","Amazon Simple Pay service capture confirmation error: the amount in the existing invoice does not match the amount in the confirmation request."
|
| 9 |
+
"Amazon Simple Pay service capture confirmation error: the existing transaction ID does not match the transaction ID in the confirmation request.","Amazon Simple Pay service capture confirmation error: the existing transaction ID does not match the transaction ID in the confirmation request."
|
| 10 |
+
"Amazon Simple Pay service capture confirmation. The invoice was captured automatically.","Amazon Simple Pay service capture confirmation. The invoice was captured automatically."
|
| 11 |
+
"Amazon Simple Pay service confirmation error: order states sequence violation.","Amazon Simple Pay service confirmation error: order states sequence violation."
|
| 12 |
+
"Amazon Simple Pay service confirmation error: the order currency does not match the currency of the IPN request.","Amazon Simple Pay service confirmation error: the order currency does not match the currency of the IPN request."
|
| 13 |
+
"Amazon Simple Pay service confirmation error: the order specified in the IPN request cannot be found.","Amazon Simple Pay service confirmation error: the order specified in the IPN request cannot be found."
|
| 14 |
+
"Amazon Simple Pay service confirmation error: the payment method in the order is not Amazon Simple Pay.","Amazon Simple Pay service confirmation error: the payment method in the order is not Amazon Simple Pay."
|
| 15 |
+
"Amazon Simple Pay service confirmed capture for invoice %s.","Amazon Simple Pay service confirmed capture for invoice %s."
|
| 16 |
+
"Amazon Simple Pay service confirmed refund for credit memo %s.","Amazon Simple Pay service confirmed refund for credit memo %s."
|
| 17 |
+
"Amazon Simple Pay service has confirmed amount authorization.","Amazon Simple Pay service has confirmed amount authorization."
|
| 18 |
+
"Amazon Simple Pay service has confirmed cancelation.","Amazon Simple Pay service has confirmed cancelation."
|
| 19 |
+
"Amazon Simple Pay service has confirmed capture for invoice %s. The invoice was automatically captured.","Amazon Simple Pay service has confirmed capture for invoice %s. The invoice was automatically captured."
|
| 20 |
+
"Amazon Simple Pay service has confirmed capture initiation.","Amazon Simple Pay service has confirmed capture initiation."
|
| 21 |
+
"Amazon Simple Pay service has confirmed capture.","Amazon Simple Pay service has confirmed capture."
|
| 22 |
+
"Amazon Simple Pay service has confirmed payment capture. Invoice %s was automatically created after confirmation.","Amazon Simple Pay service has confirmed payment capture. Invoice %s was automatically created after confirmation."
|
| 23 |
+
"Amazon Simple Pay service has confirmed payment capture. Invoice was created automatically.","Amazon Simple Pay service has confirmed payment capture. Invoice was created automatically."
|
| 24 |
+
"Amazon Simple Pay service has confirmed payment refund. Credit memo %s was automatically created after confirmation.","Amazon Simple Pay service has confirmed payment refund. Credit memo %s was automatically created after confirmation."
|
| 25 |
+
"Amazon Simple Pay service has confirmed payment refund. Credit memo was created automatically.","Amazon Simple Pay service has confirmed payment refund. Credit memo was created automatically."
|
| 26 |
+
"Amazon Simple Pay service has confirmed payment refund. The credit memo was created automatically.","Amazon Simple Pay service has confirmed payment refund. The credit memo was created automatically."
|
| 27 |
+
"Amazon Simple Pay service has confirmed refund.","Amazon Simple Pay service has confirmed refund."
|
| 28 |
+
"Amazon Simple Pay service has confirmed refund. The credit memo was processed automatically.","Amazon Simple Pay service has confirmed refund. The credit memo was processed automatically."
|
| 29 |
+
"Amazon Simple Pay service has confirmed refunded credit memo %s. The credit memo was processed automatically.","Amazon Simple Pay service has confirmed refunded credit memo %s. The credit memo was processed automatically."
|
| 30 |
+
"Amazon Simple Pay service is not available. Payment was not processed.","Amazon Simple Pay service is not available. Payment was not processed."
|
| 31 |
+
"Amazon Simple Pay service payment confirmation has failed.","Amazon Simple Pay service payment confirmation has failed."
|
| 32 |
+
"Amazon Simple Pay service refund confirmation error: the amount in the existing creditmemo does not match the amount in the confirmation request.","Amazon Simple Pay service refund confirmation error: the amount in the existing creditmemo does not match the amount in the confirmation request."
|
| 33 |
+
"Amazon Simple Pay service refund confirmation error: the confirmation request amount does not match the order amount.","Amazon Simple Pay service refund confirmation error: the confirmation request amount does not match the order amount."
|
| 34 |
+
"Amazon Simple Pay service refund confirmation error: the transaction ID in the existing creditmemo does not match the transaction ID in the confirmation request.","Amazon Simple Pay service refund confirmation error: the transaction ID in the existing creditmemo does not match the transaction ID in the confirmation request."
|
| 35 |
+
"Authorize Only","Authorize Only"
|
| 36 |
+
"Authorize and Capture","Authorize and Capture"
|
| 37 |
+
"Cancel Description","Cancel Description"
|
| 38 |
+
"Cancel Order Notification received from Checkout by Amazon service.","Cancel Order Notification received from Checkout by Amazon service."
|
| 39 |
+
"Checkout by Amazon","Checkout by Amazon"
|
| 40 |
+
"Continue Shopping","Continue Shopping"
|
| 41 |
+
"Customer was redirected to Amazon Simple Pay site","Customer was redirected to Amazon Simple Pay site"
|
| 42 |
+
"Debug","Debug"
|
| 43 |
+
"Debug Log","Debug Log"
|
| 44 |
+
"Email Sender","Email Sender"
|
| 45 |
+
"Enable","Enable"
|
| 46 |
+
"Error Log","Error Log"
|
| 47 |
+
"FPS Sandbox Service URI","FPS Sandbox Service URI"
|
| 48 |
+
"FPS Service URI","FPS Service URI"
|
| 49 |
+
"Immediate Return","Immediate Return"
|
| 50 |
+
"Invalid action code.","Invalid action code."
|
| 51 |
+
"Invalid request.","Invalid request."
|
| 52 |
+
"Invoice was created with Checkout by Amazon.","Invoice was created with Checkout by Amazon."
|
| 53 |
+
"Merchant ID","Merchant ID"
|
| 54 |
+
"Merchant Login","Merchant Login"
|
| 55 |
+
"Merchant Name","Merchant Name"
|
| 56 |
+
"Merchant Password","Merchant Password"
|
| 57 |
+
"Merchant Token","Merchant Token"
|
| 58 |
+
"Method Choice Checkout Message","Method Choice Checkout Message"
|
| 59 |
+
"New Order Notification received from Checkout by Amazon service.","New Order Notification received from Checkout by Amazon service."
|
| 60 |
+
"New Order Status","New Order Status"
|
| 61 |
+
"Notification Error Transactional Email","Notification Error Transactional Email"
|
| 62 |
+
"Order Ready To Ship Notification received form Checkout by Amazon service.","Order Ready To Ship Notification received form Checkout by Amazon service."
|
| 63 |
+
"Order was canceled with Checkout by Amazon.","Order was canceled with Checkout by Amazon."
|
| 64 |
+
"Payment Action","Payment Action"
|
| 65 |
+
"Payment Description","Payment Description"
|
| 66 |
+
"Payment Sandbox Service URI","Payment Sandbox Service URI"
|
| 67 |
+
"Payment Service URI","Payment Service URI"
|
| 68 |
+
"Payment authorization canceled with Amazon Simple Pay service.","Payment authorization canceled with Amazon Simple Pay service."
|
| 69 |
+
"Pending Amazon Simple Pay","Pending Amazon Simple Pay"
|
| 70 |
+
"Redirect Message","Redirect Message"
|
| 71 |
+
"Refund Description","Refund Description"
|
| 72 |
+
"Refund was created with Checkout by Amazon.","Refund was created with Checkout by Amazon."
|
| 73 |
+
"Report Email","Report Email"
|
| 74 |
+
"Report Error to Email","Report Error to Email"
|
| 75 |
+
"Response body is not a valid FPS response.","Response body is not a valid FPS response."
|
| 76 |
+
"SUCCESS","SUCCESS"
|
| 77 |
+
"Sandbox","Sandbox"
|
| 78 |
+
"Secret Key","Secret Key"
|
| 79 |
+
"Secret Key ID","Secret Key ID"
|
| 80 |
+
"Shipment was created with Checkout by Amazon.","Shipment was created with Checkout by Amazon."
|
| 81 |
+
"Thank you for your purchase!","Thank you for your purchase!"
|
| 82 |
+
"The customer has canceled payment and successfully returned from Amazon Simple Pay site","The customer has canceled payment and successfully returned from Amazon Simple Pay site"
|
| 83 |
+
"The customer has successfully returned from Amazon Simple Pay site","The customer has successfully returned from Amazon Simple Pay site"
|
| 84 |
+
"The invoice was created (online capture). Waiting for capture confirmation from Amazon Simple Pay service.","The invoice was created (online capture). Waiting for capture confirmation from Amazon Simple Pay service."
|
| 85 |
+
"The invoice was not refunded. Amazon Simple Pay service error: [%s] %s","The invoice was not refunded. Amazon Simple Pay service error: [%s] %s"
|
| 86 |
+
"The item specified in callback request XML was not found in quote.","The item specified in callback request XML was not found in quote."
|
| 87 |
+
"The order was not canceled. Amazon Simple Pay service error: [%s] %s","The order was not canceled. Amazon Simple Pay service error: [%s] %s"
|
| 88 |
+
"The order was not captured online. Authorization confirmation is required.","The order was not captured online. Authorization confirmation is required."
|
| 89 |
+
"The order was not captured. Amazon Simple Pay service error: [%s] %s","The order was not captured. Amazon Simple Pay service error: [%s] %s"
|
| 90 |
+
"The payment was captured online with Amazon Simple Pay service. The invoice was created. Waiting for capture confirmation from the payment service.","The payment was captured online with Amazon Simple Pay service. The invoice was created. Waiting for capture confirmation from the payment service."
|
| 91 |
+
"The payment was refunded online with Amazon Simple Pay service. The credit memo was created. Waiting for refund confirmation from Amazon Simple Pay service.","The payment was refunded online with Amazon Simple Pay service. The credit memo was created. Waiting for refund confirmation from Amazon Simple Pay service."
|
| 92 |
+
"The payment was refunded online. Waiting for refund confirmation from Amazon Simple Pay service.","The payment was refunded online. Waiting for refund confirmation from Amazon Simple Pay service."
|
| 93 |
+
"The request is not a valid IPN request.","The request is not a valid IPN request."
|
| 94 |
+
"The request was signed incorrectly or the signature is missing.","The request was signed incorrectly or the signature is missing."
|
| 95 |
+
"Title","Title"
|
| 96 |
+
"Use Callback API","Use Callback API"
|
| 97 |
+
"You will be redirected to Checkout by Amazon in a few seconds.","You will be redirected to Checkout by Amazon in a few seconds."
|
| 98 |
+
"You will receive an order confirmation email with details of your order and a link to track its progress.","You will receive an order confirmation email with details of your order and a link to track its progress."
|
| 99 |
+
"You will receive an order confirmation email with details of your order and a link to track its progress.<br/>","You will receive an order confirmation email with details of your order and a link to track its progress.<br/>"
|
| 100 |
+
"Your billing address will be ignored and you will be redirected to Checkout by Amazon website.","Your billing address will be ignored and you will be redirected to Checkout by Amazon website."
|
| 101 |
+
"Your order has been received.","Your order has been received."
|
app/locale/en_US/Mage_Authorizenet.csv
CHANGED
|
@@ -1,6 +1,7 @@
|
|
| 1 |
"--Please Select--","--Please Select--"
|
| 2 |
"API Login ID","API Login ID"
|
| 3 |
"Accepted Currency","Accepted Currency"
|
|
|
|
| 4 |
"Authorize.net Direct Post","Authorize.net Direct Post"
|
| 5 |
"Card Verification Number","Card Verification Number"
|
| 6 |
"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
|
| 1 |
"--Please Select--","--Please Select--"
|
| 2 |
"API Login ID","API Login ID"
|
| 3 |
"Accepted Currency","Accepted Currency"
|
| 4 |
+
"Amount of %s approved by payment gateway. Transaction ID: ""%s"".","Amount of %s approved by payment gateway. Transaction ID: ""%s""."
|
| 5 |
"Authorize.net Direct Post","Authorize.net Direct Post"
|
| 6 |
"Card Verification Number","Card Verification Number"
|
| 7 |
"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
|
app/locale/en_US/Mage_Bundle.csv
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
|
|
| 1 |
"* Required Fields","* Required Fields"
|
| 2 |
"-- Select --","-- Select --"
|
| 3 |
"Add New Option","Add New Option"
|
|
@@ -6,10 +7,16 @@
|
|
| 6 |
"As low as","As low as"
|
| 7 |
"Bundle Items","Bundle Items"
|
| 8 |
"Bundle Product","Bundle Product"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 9 |
"Buy %1$s with %2$s discount each","Buy %1$s with %2$s discount each"
|
| 10 |
"Catalog Product View (Bundle)","Catalog Product View (Bundle)"
|
| 11 |
"Checkbox","Checkbox"
|
| 12 |
"Choose a selection...","Choose a selection..."
|
|
|
|
| 13 |
"Close","Close"
|
| 14 |
"Default","Default"
|
| 15 |
"Default Qty","Default Qty"
|
|
@@ -17,11 +24,13 @@
|
|
| 17 |
"Drop-down","Drop-down"
|
| 18 |
"Dynamic","Dynamic"
|
| 19 |
"Excl. Tax","Excl. Tax"
|
|
|
|
| 20 |
"Fixed","Fixed"
|
| 21 |
"From","From"
|
| 22 |
"From:","From:"
|
| 23 |
"Gift Message","Gift Message"
|
| 24 |
"Incl. Tax","Incl. Tax"
|
|
|
|
| 25 |
"Input Type","Input Type"
|
| 26 |
"Is Required","Is Required"
|
| 27 |
"Message:","Message:"
|
|
@@ -53,5 +62,9 @@
|
|
| 53 |
"To","To"
|
| 54 |
"To:","To:"
|
| 55 |
"Together","Together"
|
|
|
|
| 56 |
"Use Default Value","Use Default Value"
|
| 57 |
"User Defined Qty","User Defined Qty"
|
|
|
|
|
|
|
|
|
| 1 |
+
"%1$s incl tax.","%1$s incl tax."
|
| 2 |
"* Required Fields","* Required Fields"
|
| 3 |
"-- Select --","-- Select --"
|
| 4 |
"Add New Option","Add New Option"
|
| 7 |
"As low as","As low as"
|
| 8 |
"Bundle Items","Bundle Items"
|
| 9 |
"Bundle Product","Bundle Product"
|
| 10 |
+
"Buy %1$s","Buy %1$s"
|
| 11 |
+
"Buy %1$s for","Buy %1$s for"
|
| 12 |
+
"Buy %1$s for %2$s","Buy %1$s for %2$s"
|
| 13 |
+
"Buy %1$s for %2$s (%3$s incl. tax) each","Buy %1$s for %2$s (%3$s incl. tax) each"
|
| 14 |
+
"Buy %1$s for %2$s each","Buy %1$s for %2$s each"
|
| 15 |
"Buy %1$s with %2$s discount each","Buy %1$s with %2$s discount each"
|
| 16 |
"Catalog Product View (Bundle)","Catalog Product View (Bundle)"
|
| 17 |
"Checkbox","Checkbox"
|
| 18 |
"Choose a selection...","Choose a selection..."
|
| 19 |
+
"Click for price","Click for price"
|
| 20 |
"Close","Close"
|
| 21 |
"Default","Default"
|
| 22 |
"Default Qty","Default Qty"
|
| 24 |
"Drop-down","Drop-down"
|
| 25 |
"Dynamic","Dynamic"
|
| 26 |
"Excl. Tax","Excl. Tax"
|
| 27 |
+
"Excl. Tax:","Excl. Tax:"
|
| 28 |
"Fixed","Fixed"
|
| 29 |
"From","From"
|
| 30 |
"From:","From:"
|
| 31 |
"Gift Message","Gift Message"
|
| 32 |
"Incl. Tax","Incl. Tax"
|
| 33 |
+
"Incl. Tax:","Incl. Tax:"
|
| 34 |
"Input Type","Input Type"
|
| 35 |
"Is Required","Is Required"
|
| 36 |
"Message:","Message:"
|
| 62 |
"To","To"
|
| 63 |
"To:","To:"
|
| 64 |
"Together","Together"
|
| 65 |
+
"Total incl. Tax: %1$s","Total incl. Tax: %1$s"
|
| 66 |
"Use Default Value","Use Default Value"
|
| 67 |
"User Defined Qty","User Defined Qty"
|
| 68 |
+
"and","and"
|
| 69 |
+
"each","each"
|
| 70 |
+
"save","save"
|
app/locale/en_US/Mage_Core.csv
CHANGED
|
@@ -152,10 +152,10 @@
|
|
| 152 |
"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
|
| 153 |
"Invalid URL '%value%'.","Invalid URL '%value%'."
|
| 154 |
"Invalid base url type","Invalid base url type"
|
| 155 |
-
"Invalid block name to set child %s: %s","Invalid block name to set child %s: %s"
|
| 156 |
"Invalid block type: %s","Invalid block type: %s"
|
| 157 |
"Invalid block: %s","Invalid block: %s"
|
| 158 |
"Invalid connection","Invalid connection"
|
|
|
|
| 159 |
"Invalid layout update handle","Invalid layout update handle"
|
| 160 |
"Invalid messages storage ""%s"" for layout messages initialization","Invalid messages storage ""%s"" for layout messages initialization"
|
| 161 |
"Invalid query","Invalid query"
|
| 152 |
"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
|
| 153 |
"Invalid URL '%value%'.","Invalid URL '%value%'."
|
| 154 |
"Invalid base url type","Invalid base url type"
|
|
|
|
| 155 |
"Invalid block type: %s","Invalid block type: %s"
|
| 156 |
"Invalid block: %s","Invalid block: %s"
|
| 157 |
"Invalid connection","Invalid connection"
|
| 158 |
+
"Invalid date","Invalid date"
|
| 159 |
"Invalid layout update handle","Invalid layout update handle"
|
| 160 |
"Invalid messages storage ""%s"" for layout messages initialization","Invalid messages storage ""%s"" for layout messages initialization"
|
| 161 |
"Invalid query","Invalid query"
|
app/locale/en_US/Mage_CurrencySymbol.csv
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
|
|
| 1 |
"Custom currency symbols were applied successfully.","Custom currency symbols were applied successfully."
|
| 2 |
"Manage Currency","Manage Currency"
|
| 3 |
"Manage Currency Rates","Manage Currency Rates"
|
| 4 |
"Rates","Rates"
|
| 5 |
"Save Currency Symbols","Save Currency Symbols"
|
|
|
|
| 6 |
"Symbols","Symbols"
|
| 7 |
"System","System"
|
| 8 |
-
"Use Default","Use Default"
|
| 9 |
"Use Standard","Use Standard"
|
| 10 |
-
"Use Website","Use Website"
|
| 1 |
+
"Currency","Currency"
|
| 2 |
"Custom currency symbols were applied successfully.","Custom currency symbols were applied successfully."
|
| 3 |
"Manage Currency","Manage Currency"
|
| 4 |
"Manage Currency Rates","Manage Currency Rates"
|
| 5 |
"Rates","Rates"
|
| 6 |
"Save Currency Symbols","Save Currency Symbols"
|
| 7 |
+
"Symbol","Symbol"
|
| 8 |
"Symbols","Symbols"
|
| 9 |
"System","System"
|
|
|
|
| 10 |
"Use Standard","Use Standard"
|
|
|
app/locale/en_US/Mage_GoogleAnalytics.csv
CHANGED
|
@@ -1,4 +1,5 @@
|
|
| 1 |
"Account Number","Account Number"
|
| 2 |
"Enable","Enable"
|
|
|
|
| 3 |
"Google API","Google API"
|
| 4 |
"Google Analytics","Google Analytics"
|
| 1 |
"Account Number","Account Number"
|
| 2 |
"Enable","Enable"
|
| 3 |
+
"Enable IP anonymization","Enable IP anonymization"
|
| 4 |
"Google API","Google API"
|
| 5 |
"Google Analytics","Google Analytics"
|
app/locale/en_US/Mage_ImportExport.csv
CHANGED
|
@@ -1,48 +1,71 @@
|
|
| 1 |
-
"
|
| 2 |
"-- Please Select --","-- Please Select --"
|
| 3 |
"Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract","Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract"
|
|
|
|
| 4 |
"Adapter type must be a non empty string","Adapter type must be a non empty string"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 5 |
"Can not determine attribute filter type","Can not determine attribute filter type"
|
| 6 |
-
"Can not find required columns: ","Can not find required columns: "
|
| 7 |
-
"
|
| 8 |
"Check Data","Check Data"
|
|
|
|
| 9 |
"Column names have duplicates","Column names have duplicates"
|
| 10 |
"Column names is empty or is not an array","Column names is empty or is not an array"
|
| 11 |
"Column names: ""%s"" are invalid","Column names: ""%s"" are invalid"
|
| 12 |
-
"
|
| 13 |
"Data is invalid or file is not uploaded","Data is invalid or file is not uploaded"
|
|
|
|
| 14 |
"Destination directory is not writable","Destination directory is not writable"
|
| 15 |
"Destination file is not writable","Destination file is not writable"
|
| 16 |
"Destination file path must be a string","Destination file path must be a string"
|
| 17 |
-
"
|
|
|
|
|
|
|
|
|
|
| 18 |
"Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract","Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract"
|
| 19 |
"Entity is unknown","Entity is unknown"
|
| 20 |
"Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract","Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract"
|
| 21 |
"Entity type model must be an instance of Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract","Entity type model must be an instance of Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract"
|
| 22 |
"Error in data structure: behaviors are mixed","Error in data structure: behaviors are mixed"
|
| 23 |
"Error in data structure: entity codes are mixed","Error in data structure: entity codes are mixed"
|
|
|
|
| 24 |
"Export","Export"
|
| 25 |
-
"Export
|
| 26 |
-
"
|
|
|
|
|
|
|
|
|
|
| 27 |
"File does not contain data. Please upload another one","File does not contain data. Please upload another one"
|
| 28 |
"File format is unknown","File format is unknown"
|
| 29 |
"File is partially valid, but import is not possible","File is partially valid, but import is not possible"
|
| 30 |
"File is totally invalid. Please fix errors and re-upload file","File is totally invalid. Please fix errors and re-upload file"
|
| 31 |
"File is valid! To start import process press ""Import"" button","File is valid! To start import process press ""Import"" button"
|
| 32 |
"File is valid, but import is not possible","File is valid, but import is not possible"
|
|
|
|
|
|
|
|
|
|
| 33 |
"Header column names already set","Header column names already set"
|
| 34 |
"Import","Import"
|
| 35 |
-
"Import
|
| 36 |
-
"Import
|
|
|
|
| 37 |
"Import successfully done.","Import successfully done."
|
| 38 |
"Import/Export","Import/Export"
|
| 39 |
-
"In/Out","In/Out"
|
| 40 |
"Input entity code is not equal to entity adapter code","Input entity code is not equal to entity adapter code"
|
| 41 |
"Invalid entity","Invalid entity"
|
|
|
|
| 42 |
"Invalid file format","Invalid file format"
|
| 43 |
"Invalid parameters","Invalid parameters"
|
| 44 |
"Invalid seek position","Invalid seek position"
|
| 45 |
"Invalid value for '%s'","Invalid value for '%s'"
|
|
|
|
| 46 |
"No filter data provided","No filter data provided"
|
| 47 |
"No source specified","No source specified"
|
| 48 |
"No valid data sent","No valid data sent"
|
|
@@ -51,13 +74,20 @@
|
|
| 51 |
"Not implemented yet","Not implemented yet"
|
| 52 |
"Please fix errors and re-upload file","Please fix errors and re-upload file"
|
| 53 |
"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors"
|
| 54 |
-
"
|
|
|
|
|
|
|
|
|
|
| 55 |
"Source file moving failed","Source file moving failed"
|
| 56 |
"Source file path must be a string","Source file path must be a string"
|
| 57 |
"Source is not set","Source is not set"
|
| 58 |
"Status","Status"
|
| 59 |
-
"System busy","System busy"
|
| 60 |
"There are no product types available for export","There are no product types available for export"
|
|
|
|
|
|
|
| 61 |
"Total size of uploadable files must not exceed %s","Total size of uploadable files must not exceed %s"
|
|
|
|
| 62 |
"Uploaded file has no extension","Uploaded file has no extension"
|
| 63 |
-
"Validation
|
|
|
|
|
|
| 1 |
+
"%s file does not exists or is not readable","%s file does not exists or is not readable"
|
| 2 |
"-- Please Select --","-- Please Select --"
|
| 3 |
"Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract","Adapter must be an instance of Mage_ImportExport_Model_Import_Adapter_Abstract"
|
| 4 |
+
"Adapter object must be an instance of %s","Adapter object must be an instance of %s"
|
| 5 |
"Adapter type must be a non empty string","Adapter type must be a non empty string"
|
| 6 |
+
"Append Complex Data","Append Complex Data"
|
| 7 |
+
"Attribute Code","Attribute Code"
|
| 8 |
+
"Attribute Label","Attribute Label"
|
| 9 |
+
"Attribute does not has options, so filtering is impossible","Attribute does not has options, so filtering is impossible"
|
| 10 |
+
"Begin data validation","Begin data validation"
|
| 11 |
+
"Begin export of %s","Begin export of %s"
|
| 12 |
+
"Begin import of ""%s"" with ""%s"" behavior","Begin import of ""%s"" with ""%s"" behavior"
|
| 13 |
+
"CSV","CSV"
|
| 14 |
"Can not determine attribute filter type","Can not determine attribute filter type"
|
| 15 |
+
"Can not find required columns: %s","Can not find required columns: %s"
|
| 16 |
+
"Cannot get autoincrement value","Cannot get autoincrement value"
|
| 17 |
"Check Data","Check Data"
|
| 18 |
+
"Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d","Checked rows: %d, checked entities: %d, invalid rows: %d, total errors: %d"
|
| 19 |
"Column names have duplicates","Column names have duplicates"
|
| 20 |
"Column names is empty or is not an array","Column names is empty or is not an array"
|
| 21 |
"Column names: ""%s"" are invalid","Column names: ""%s"" are invalid"
|
| 22 |
+
"Customers","Customers"
|
| 23 |
"Data is invalid or file is not uploaded","Data is invalid or file is not uploaded"
|
| 24 |
+
"Delete Entities","Delete Entities"
|
| 25 |
"Destination directory is not writable","Destination directory is not writable"
|
| 26 |
"Destination file is not writable","Destination file is not writable"
|
| 27 |
"Destination file path must be a string","Destination file path must be a string"
|
| 28 |
+
"Done import data validation","Done import data validation"
|
| 29 |
+
"Duplicate Unique Attribute for '%s'","Duplicate Unique Attribute for '%s'"
|
| 30 |
+
"Entity Type","Entity Type"
|
| 31 |
+
"Entity adapter obejct must be an instance of Mage_ImportExport_Model_Export_Entity_Abstract","Entity adapter obejct must be an instance of Mage_ImportExport_Model_Export_Entity_Abstract"
|
| 32 |
"Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract","Entity adapter object must be an instance of Mage_ImportExport_Model_Import_Entity_Abstract"
|
| 33 |
"Entity is unknown","Entity is unknown"
|
| 34 |
"Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract","Entity type model must be an instance of Mage_ImportExport_Model_Export_Entity_Product_Type_Abstract"
|
| 35 |
"Entity type model must be an instance of Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract","Entity type model must be an instance of Mage_ImportExport_Model_Import_Entity_Product_Type_Abstract"
|
| 36 |
"Error in data structure: behaviors are mixed","Error in data structure: behaviors are mixed"
|
| 37 |
"Error in data structure: entity codes are mixed","Error in data structure: entity codes are mixed"
|
| 38 |
+
"Errors limit (%d) reached. Please fix errors and re-upload file","Errors limit (%d) reached. Please fix errors and re-upload file"
|
| 39 |
"Export","Export"
|
| 40 |
+
"Export File Format","Export File Format"
|
| 41 |
+
"Export Settings","Export Settings"
|
| 42 |
+
"Export has been done.","Export has been done."
|
| 43 |
+
"Exported %s rows.","Exported %s rows."
|
| 44 |
+
"File does not contain data.","File does not contain data."
|
| 45 |
"File does not contain data. Please upload another one","File does not contain data. Please upload another one"
|
| 46 |
"File format is unknown","File format is unknown"
|
| 47 |
"File is partially valid, but import is not possible","File is partially valid, but import is not possible"
|
| 48 |
"File is totally invalid. Please fix errors and re-upload file","File is totally invalid. Please fix errors and re-upload file"
|
| 49 |
"File is valid! To start import process press ""Import"" button","File is valid! To start import process press ""Import"" button"
|
| 50 |
"File is valid, but import is not possible","File is valid, but import is not possible"
|
| 51 |
+
"File was not uploaded","File was not uploaded"
|
| 52 |
+
"Filter","Filter"
|
| 53 |
+
"From","From"
|
| 54 |
"Header column names already set","Header column names already set"
|
| 55 |
"Import","Import"
|
| 56 |
+
"Import Behavior","Import Behavior"
|
| 57 |
+
"Import Settings","Import Settings"
|
| 58 |
+
"Import has been done successfuly.","Import has been done successfuly."
|
| 59 |
"Import successfully done.","Import successfully done."
|
| 60 |
"Import/Export","Import/Export"
|
|
|
|
| 61 |
"Input entity code is not equal to entity adapter code","Input entity code is not equal to entity adapter code"
|
| 62 |
"Invalid entity","Invalid entity"
|
| 63 |
+
"Invalid entity model","Invalid entity model"
|
| 64 |
"Invalid file format","Invalid file format"
|
| 65 |
"Invalid parameters","Invalid parameters"
|
| 66 |
"Invalid seek position","Invalid seek position"
|
| 67 |
"Invalid value for '%s'","Invalid value for '%s'"
|
| 68 |
+
"Invalid value for '%s' column","Invalid value for '%s' column"
|
| 69 |
"No filter data provided","No filter data provided"
|
| 70 |
"No source specified","No source specified"
|
| 71 |
"No valid data sent","No valid data sent"
|
| 74 |
"Not implemented yet","Not implemented yet"
|
| 75 |
"Please fix errors and re-upload file","Please fix errors and re-upload file"
|
| 76 |
"Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors","Please fix errors and re-upload file or simply press ""Import"" button to skip rows with errors"
|
| 77 |
+
"Products","Products"
|
| 78 |
+
"Replace Existing Complex Data","Replace Existing Complex Data"
|
| 79 |
+
"Select File to Import","Select File to Import"
|
| 80 |
+
"Skip","Skip"
|
| 81 |
"Source file moving failed","Source file moving failed"
|
| 82 |
"Source file path must be a string","Source file path must be a string"
|
| 83 |
"Source is not set","Source is not set"
|
| 84 |
"Status","Status"
|
|
|
|
| 85 |
"There are no product types available for export","There are no product types available for export"
|
| 86 |
+
"There is no data for export","There is no data for export"
|
| 87 |
+
"To","To"
|
| 88 |
"Total size of uploadable files must not exceed %s","Total size of uploadable files must not exceed %s"
|
| 89 |
+
"Unknown attribute filter type","Unknown attribute filter type"
|
| 90 |
"Uploaded file has no extension","Uploaded file has no extension"
|
| 91 |
+
"Validation finished successfully","Validation finished successfully"
|
| 92 |
+
"in rows","in rows"
|
| 93 |
+
"in rows:","in rows:"
|
app/locale/en_US/Mage_Page.csv
CHANGED
|
@@ -63,7 +63,6 @@
|
|
| 63 |
"Select date","Select date"
|
| 64 |
"Show","Show"
|
| 65 |
"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","This is a demo store. Any orders placed through this store will not be honored or fulfilled."
|
| 66 |
-
"This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our <a href=""%s"">Privacy Policy page</a>. To accept cookies from this site, please click the Allow button below.","This website requires cookies to provide all of its features. For more information on what data is contained in the cookies, please see our <a href=""%s"">Privacy Policy page</a>. To accept cookies from this site, please click the Allow button below."
|
| 67 |
"Time selection:","Time selection:"
|
| 68 |
"Time:","Time:"
|
| 69 |
"Welcome, %s!","Welcome, %s!"
|
| 63 |
"Select date","Select date"
|
| 64 |
"Show","Show"
|
| 65 |
"This is a demo store. Any orders placed through this store will not be honored or fulfilled.","This is a demo store. Any orders placed through this store will not be honored or fulfilled."
|
|
|
|
| 66 |
"Time selection:","Time selection:"
|
| 67 |
"Time:","Time:"
|
| 68 |
"Welcome, %s!","Welcome, %s!"
|
app/locale/en_US/Mage_Sales.csv
CHANGED
|
@@ -259,6 +259,7 @@
|
|
| 259 |
"Gift Message for this Order","Gift Message for this Order"
|
| 260 |
"Gift Options","Gift Options"
|
| 261 |
"Girth","Girth"
|
|
|
|
| 262 |
"Grand Total","Grand Total"
|
| 263 |
"Grand Total to be Charged","Grand Total to be Charged"
|
| 264 |
"Guest","Guest"
|
|
@@ -267,9 +268,9 @@
|
|
| 267 |
"Hold","Hold"
|
| 268 |
"Hold action is not available.","Hold action is not available."
|
| 269 |
"Hold order","Hold order"
|
|
|
|
| 270 |
"ID","ID"
|
| 271 |
"ID #","ID #"
|
| 272 |
-
"IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo.","IPN ""Refunded"". Refund issued by merchant. Registered notification about refunded amount of %s. Transaction ID: ""%s"". Credit Memo has not been created. Please create offline Credit Memo."
|
| 273 |
"If empty, the default description above will be used.","If empty, the default description above will be used."
|
| 274 |
"If empty, the default error above will be used.","If empty, the default error above will be used."
|
| 275 |
"If the invoice was created offline, try creating an offline creditmemo.","If the invoice was created offline, try creating an offline creditmemo."
|
|
@@ -289,6 +290,7 @@
|
|
| 289 |
"Invalid qty to ship for item ""%s""","Invalid qty to ship for item ""%s"""
|
| 290 |
"Invalid renderer model","Invalid renderer model"
|
| 291 |
"Invalid request for adding product to quote.","Invalid request for adding product to quote."
|
|
|
|
| 292 |
"Invoice","Invoice"
|
| 293 |
"Invoice #","Invoice #"
|
| 294 |
"Invoice # ","Invoice # "
|
|
@@ -857,6 +859,7 @@
|
|
| 857 |
"Wrong state: ""%s"".","Wrong state: ""%s""."
|
| 858 |
"Yes","Yes"
|
| 859 |
"You can leave a box blank if you don\'t wish to add a gift message for whole order","You can leave a box blank if you don\'t wish to add a gift message for whole order"
|
|
|
|
| 860 |
"You have placed no orders.","You have placed no orders."
|
| 861 |
"You will be redirected to the payment system website.","You will be redirected to the payment system website."
|
| 862 |
"Your credit card will be charged for","Your credit card will be charged for"
|
| 259 |
"Gift Message for this Order","Gift Message for this Order"
|
| 260 |
"Gift Options","Gift Options"
|
| 261 |
"Girth","Girth"
|
| 262 |
+
"Go to Home Page","Go to Home Page"
|
| 263 |
"Grand Total","Grand Total"
|
| 264 |
"Grand Total to be Charged","Grand Total to be Charged"
|
| 265 |
"Guest","Guest"
|
| 268 |
"Hold","Hold"
|
| 269 |
"Hold action is not available.","Hold action is not available."
|
| 270 |
"Hold order","Hold order"
|
| 271 |
+
"Home","Home"
|
| 272 |
"ID","ID"
|
| 273 |
"ID #","ID #"
|
|
|
|
| 274 |
"If empty, the default description above will be used.","If empty, the default description above will be used."
|
| 275 |
"If empty, the default error above will be used.","If empty, the default error above will be used."
|
| 276 |
"If the invoice was created offline, try creating an offline creditmemo.","If the invoice was created offline, try creating an offline creditmemo."
|
| 290 |
"Invalid qty to ship for item ""%s""","Invalid qty to ship for item ""%s"""
|
| 291 |
"Invalid renderer model","Invalid renderer model"
|
| 292 |
"Invalid request for adding product to quote.","Invalid request for adding product to quote."
|
| 293 |
+
"Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship"
|
| 294 |
"Invoice","Invoice"
|
| 295 |
"Invoice #","Invoice #"
|
| 296 |
"Invoice # ","Invoice # "
|
| 859 |
"Wrong state: ""%s"".","Wrong state: ""%s""."
|
| 860 |
"Yes","Yes"
|
| 861 |
"You can leave a box blank if you don\'t wish to add a gift message for whole order","You can leave a box blank if you don\'t wish to add a gift message for whole order"
|
| 862 |
+
"You don\'t have permissions to manage this order because of one or more products are not permitted for your website.","You don\'t have permissions to manage this order because of one or more products are not permitted for your website."
|
| 863 |
"You have placed no orders.","You have placed no orders."
|
| 864 |
"You will be redirected to the payment system website.","You will be redirected to the payment system website."
|
| 865 |
"Your credit card will be charged for","Your credit card will be charged for"
|
app/locale/en_US/Mage_Tax.csv
CHANGED
|
@@ -147,6 +147,7 @@
|
|
| 147 |
"Total","Total"
|
| 148 |
"Unit Price","Unit Price"
|
| 149 |
"Warning tax configuration can result in rounding errors","Warning tax configuration can result in rounding errors"
|
|
|
|
| 150 |
"Warning tax discount configuration might result in different discounts than a customer might expect","Warning tax discount configuration might result in different discounts than a customer might expect"
|
| 151 |
"Whether catalog prices entered by admin include tax.","Whether catalog prices entered by admin include tax."
|
| 152 |
"Whether shipping amounts entered by admin or obtained from gateways include tax.","Whether shipping amounts entered by admin or obtained from gateways include tax."
|
| 147 |
"Total","Total"
|
| 148 |
"Unit Price","Unit Price"
|
| 149 |
"Warning tax configuration can result in rounding errors","Warning tax configuration can result in rounding errors"
|
| 150 |
+
"Warning tax configuration can result in unexpected FPT prices on applicable devices","Warning tax configuration can result in unexpected FPT prices on applicable devices"
|
| 151 |
"Warning tax discount configuration might result in different discounts than a customer might expect","Warning tax discount configuration might result in different discounts than a customer might expect"
|
| 152 |
"Whether catalog prices entered by admin include tax.","Whether catalog prices entered by admin include tax."
|
| 153 |
"Whether shipping amounts entered by admin or obtained from gateways include tax.","Whether shipping amounts entered by admin or obtained from gateways include tax."
|
app/locale/en_US/Mage_Usa.csv
CHANGED
|
@@ -4,7 +4,6 @@
|
|
| 4 |
"2 Day","2 Day"
|
| 5 |
"2 Day AM","2 Day AM"
|
| 6 |
"2 Day Freight","2 Day Freight"
|
| 7 |
-
"2Day","2Day"
|
| 8 |
"2nd Day Air","2nd Day Air"
|
| 9 |
"2nd Day Air AM","2nd Day Air AM"
|
| 10 |
"2nd Day Air AM Letter","2nd Day Air AM Letter"
|
|
@@ -80,7 +79,6 @@
|
|
| 80 |
"Express 10:30 AM","Express 10:30 AM"
|
| 81 |
"Express 12:00","Express 12:00"
|
| 82 |
"Express 9:00","Express 9:00"
|
| 83 |
-
"Express Mail","Express Mail"
|
| 84 |
"Express Saturday","Express Saturday"
|
| 85 |
"Express Saver","Express Saver"
|
| 86 |
"Express easy","Express easy"
|
|
@@ -191,7 +189,6 @@
|
|
| 191 |
"Packaging","Packaging"
|
| 192 |
"Pallet","Pallet"
|
| 193 |
"Parcel","Parcel"
|
| 194 |
-
"Parcel Post","Parcel Post"
|
| 195 |
"Password","Password"
|
| 196 |
"Pickup Method","Pickup Method"
|
| 197 |
"Piece Id barcode is missing","Piece Id barcode is missing"
|
| 4 |
"2 Day","2 Day"
|
| 5 |
"2 Day AM","2 Day AM"
|
| 6 |
"2 Day Freight","2 Day Freight"
|
|
|
|
| 7 |
"2nd Day Air","2nd Day Air"
|
| 8 |
"2nd Day Air AM","2nd Day Air AM"
|
| 9 |
"2nd Day Air AM Letter","2nd Day Air AM Letter"
|
| 79 |
"Express 10:30 AM","Express 10:30 AM"
|
| 80 |
"Express 12:00","Express 12:00"
|
| 81 |
"Express 9:00","Express 9:00"
|
|
|
|
| 82 |
"Express Saturday","Express Saturday"
|
| 83 |
"Express Saver","Express Saver"
|
| 84 |
"Express easy","Express easy"
|
| 189 |
"Packaging","Packaging"
|
| 190 |
"Pallet","Pallet"
|
| 191 |
"Parcel","Parcel"
|
|
|
|
| 192 |
"Password","Password"
|
| 193 |
"Pickup Method","Pickup Method"
|
| 194 |
"Piece Id barcode is missing","Piece Id barcode is missing"
|
app/locale/en_US/Mage_Weee.csv
CHANGED
|
@@ -1,6 +1,5 @@
|
|
| 1 |
"All Websites","All Websites"
|
| 2 |
"Apply Discounts To FPT","Apply Discounts To FPT"
|
| 3 |
-
"Apply Tax To FPT","Apply Tax To FPT"
|
| 4 |
"Display Prices In Emails","Display Prices In Emails"
|
| 5 |
"Display Prices In Product Lists","Display Prices In Product Lists"
|
| 6 |
"Display Prices In Sales Modules","Display Prices In Sales Modules"
|
|
@@ -8,12 +7,16 @@
|
|
| 8 |
"Enable FPT","Enable FPT"
|
| 9 |
"Excluding FPT","Excluding FPT"
|
| 10 |
"Excluding FPT, FPT description, final price","Excluding FPT, FPT description, final price"
|
|
|
|
| 11 |
"Fixed Product Tax","Fixed Product Tax"
|
| 12 |
"Fixed Product Taxes","Fixed Product Taxes"
|
| 13 |
"Include FPT In Subtotal","Include FPT In Subtotal"
|
| 14 |
"Including FPT and FPT description","Including FPT and FPT description"
|
| 15 |
"Including FPT and FPT description [incl. FPT VAT]","Including FPT and FPT description [incl. FPT VAT]"
|
| 16 |
"Including FPT only","Including FPT only"
|
|
|
|
|
|
|
|
|
|
| 17 |
"Total","Total"
|
| 18 |
"Total Incl. Tax","Total Incl. Tax"
|
| 19 |
"Total excl. tax","Total excl. tax"
|
| 1 |
"All Websites","All Websites"
|
| 2 |
"Apply Discounts To FPT","Apply Discounts To FPT"
|
|
|
|
| 3 |
"Display Prices In Emails","Display Prices In Emails"
|
| 4 |
"Display Prices In Product Lists","Display Prices In Product Lists"
|
| 5 |
"Display Prices In Sales Modules","Display Prices In Sales Modules"
|
| 7 |
"Enable FPT","Enable FPT"
|
| 8 |
"Excluding FPT","Excluding FPT"
|
| 9 |
"Excluding FPT, FPT description, final price","Excluding FPT, FPT description, final price"
|
| 10 |
+
"FPT Tax Configuration","FPT Tax Configuration"
|
| 11 |
"Fixed Product Tax","Fixed Product Tax"
|
| 12 |
"Fixed Product Taxes","Fixed Product Taxes"
|
| 13 |
"Include FPT In Subtotal","Include FPT In Subtotal"
|
| 14 |
"Including FPT and FPT description","Including FPT and FPT description"
|
| 15 |
"Including FPT and FPT description [incl. FPT VAT]","Including FPT and FPT description [incl. FPT VAT]"
|
| 16 |
"Including FPT only","Including FPT only"
|
| 17 |
+
"Loaded and Displayed with Tax","Loaded and Displayed with Tax"
|
| 18 |
+
"Not Taxed","Not Taxed"
|
| 19 |
+
"Taxed","Taxed"
|
| 20 |
"Total","Total"
|
| 21 |
"Total Incl. Tax","Total Incl. Tax"
|
| 22 |
"Total excl. tax","Total excl. tax"
|
app/locale/en_US/template/email/payment_failed.html
CHANGED
|
@@ -1,7 +1,4 @@
|
|
| 1 |
-
|
| 2 |
-
|
| 3 |
-
Use vars: {{var var_name}}
|
| 4 |
-
*}<!--@subject Payment Transaction Failed Reminder @-->
|
| 5 |
<!--@vars
|
| 6 |
{"var reason":"Transaction Failed Reason",
|
| 7 |
"var checkoutType":"Checkout Type",
|
| 1 |
+
<!--@subject Payment Transaction Failed Reminder @-->
|
|
|
|
|
|
|
|
|
|
| 2 |
<!--@vars
|
| 3 |
{"var reason":"Transaction Failed Reason",
|
| 4 |
"var checkoutType":"Checkout Type",
|
app/locale/en_US/template/email/product_share.html
CHANGED
|
@@ -1,21 +1,12 @@
|
|
| 1 |
-
|
| 2 |
-
|
| 3 |
-
Available vars in this template:
|
| 4 |
-
- name Recipient name
|
| 5 |
-
- email Recipient Email address
|
| 6 |
-
- product_name Product name
|
| 7 |
-
- product_url Url for product
|
| 8 |
-
- product_image Url for product small image (75 px)
|
| 9 |
-
- message Sender custom message
|
| 10 |
-
- sender_name Sender name
|
| 11 |
-
- sender_email Sender email
|
| 12 |
-
|
| 13 |
-
Use vars: {{var var_name}}
|
| 14 |
-
*}<!--@subject Welcome, {{var name}} @-->
|
| 15 |
<!--@vars
|
| 16 |
{"htmlescape var=$name":"Recipient Name",
|
|
|
|
| 17 |
"var product_url":"Url for Product",
|
| 18 |
"var product_name":"Product Name",
|
|
|
|
|
|
|
|
|
|
| 19 |
"var message":"Sender Message"}
|
| 20 |
@-->
|
| 21 |
|
| 1 |
+
<!--@subject Welcome, {{var name}} @-->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2 |
<!--@vars
|
| 3 |
{"htmlescape var=$name":"Recipient Name",
|
| 4 |
+
"var email":"Recipient Email address",
|
| 5 |
"var product_url":"Url for Product",
|
| 6 |
"var product_name":"Product Name",
|
| 7 |
+
"var product_image":"Url for product small image (75 px)",
|
| 8 |
+
"var sender_name":"Sender name",
|
| 9 |
+
"var sender_email":"Sender email",
|
| 10 |
"var message":"Sender Message"}
|
| 11 |
@-->
|
| 12 |
|
app/locale/en_US/template/email/token.html
CHANGED
|
@@ -1,12 +1,4 @@
|
|
| 1 |
-
|
| 2 |
-
|
| 3 |
-
Available vars in this template:
|
| 4 |
-
- $userName User name
|
| 5 |
-
- $applicationName Application name
|
| 6 |
-
- $status Token new status
|
| 7 |
-
|
| 8 |
-
Use vars: {{var var_name}}
|
| 9 |
-
*}<!--@subject Welcome, {{var name}} @-->
|
| 10 |
<!--@vars
|
| 11 |
{"htmlescape var=$userName":"User name",
|
| 12 |
"var $applicationName":"Application name",
|
| 1 |
+
<!--@subject Welcome, {{var name}} @-->
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 2 |
<!--@vars
|
| 3 |
{"htmlescape var=$userName":"User name",
|
| 4 |
"var $applicationName":"Application name",
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Mage_Locale_en_US</name>
|
| 4 |
-
<version>1.8.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>en_US locale</summary>
|
| 10 |
<description>en_US locale</description>
|
| 11 |
-
<notes>1.8.
|
| 12 |
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
-
<date>2013-
|
| 14 |
-
<time>
|
| 15 |
-
<contents><target name="magelocale"><dir name="en_US"><file name="Mage_AdminNotification.csv" hash="e240a88785e337747afb4d0bc83ccaba"/><file name="
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 18 |
</package>
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Mage_Locale_en_US</name>
|
| 4 |
+
<version>1.8.1.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>en_US locale</summary>
|
| 10 |
<description>en_US locale</description>
|
| 11 |
+
<notes>1.8.1.0</notes>
|
| 12 |
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
+
<date>2013-11-22</date>
|
| 14 |
+
<time>04:17:07</time>
|
| 15 |
+
<contents><target name="magelocale"><dir name="en_US"><file name="Mage_AdminNotification.csv" hash="e240a88785e337747afb4d0bc83ccaba"/><file name="Mage_AmazonPayments.csv" hash="00494825779e0ae3f0db0abd30e666b7"/><file name="Mage_Api.csv" hash="5a8919e82128dbd894c8f22c8238384d"/><file name="Mage_Api2.csv" hash="bc4b31da02edb34d29274da37a0a0f60"/><file name="Mage_Authorizenet.csv" hash="56def78c56270d23b57c1c17d3304288"/><file name="Mage_Backup.csv" hash="7fb40353a4c161de2a92edd8dcb35587"/><file name="Mage_Bundle.csv" hash="20666ebd929c9b87aa6c6ebe05b3a599"/><file name="Mage_Captcha.csv" hash="de6aef08396245ed644b213ecfcf309b"/><file name="Mage_Catalog.csv" hash="847afe1d7b67e481f25e5afc3bfc06fe"/><file name="Mage_CatalogInventory.csv" hash="969014c8d71762ac5b9ed41c08412258"/><file name="Mage_CatalogRule.csv" hash="7b7d6ad17c61efa14ade33c0fb443d36"/><file name="Mage_CatalogSearch.csv" hash="9d822bca8067087dabe1d213193a2def"/><file name="Mage_Checkout.csv" hash="f6c6767b40c2f70912d09c0c6c68f453"/><file name="Mage_Cms.csv" hash="9a538e344acce7afa686fbed65082c63"/><file name="Mage_Connect.csv" hash="8cd1b22e3bb2b18a59b6bfb6a7e4e7f9"/><file name="Mage_Contacts.csv" hash="7e367e9a924c19b6df2fa5c8adca9be4"/><file name="Mage_Core.csv" hash="426b99818aceb513f12b233a6797aa9b"/><file name="Mage_Cron.csv" hash="e5803e0da7c568134db4864b8eb55f22"/><file name="Mage_CurrencySymbol.csv" hash="2cc13530e2f9387349c6a162d4d22bc9"/><file name="Mage_Customer.csv" hash="6c8628de9013ac6c2ef86623e1554ba2"/><file name="Mage_Dataflow.csv" hash="02ddb4090005e6678f020ac96c2cbe81"/><file name="Mage_Directory.csv" hash="615c41b2941e20bb118ebd41b862b934"/><file name="Mage_Downloadable.csv" hash="a6e6779b14563a09a8dd23e8ed20e418"/><file name="Mage_Eav.csv" hash="9b9e7506f519e45f5a9b44355425f04b"/><file name="Mage_GiftMessage.csv" hash="6cd672267af7f7183f47c58450c2779a"/><file name="Mage_GoogleAnalytics.csv" hash="c71e996ad7feb3c33dc4b0077795731e"/><file name="Mage_GoogleBase.csv" hash="453420e7b2a7c67d983436cd07c3f1c1"/><file name="Mage_GoogleCheckout.csv" hash="218bdb6351129bc11f5fbb7abeff7e18"/><file name="Mage_ImportExport.csv" hash="cd3f58a3c62c800910e5eada1ec8e90f"/><file name="Mage_Index.csv" hash="a12d6e56dec19a45380375e7ea3f7a7c"/><file name="Mage_Install.csv" hash="ff1231e1db62fc550cac4674d0ba5190"/><file name="Mage_Log.csv" hash="671884c4618da93ca90d2d92404b6247"/><file name="Mage_Media.csv" hash="234187a0e1b83a03cb911452a4637357"/><file name="Mage_Newsletter.csv" hash="0b3f84564b496b40b47221f197d494d9"/><file name="Mage_Oauth.csv" hash="2f7bcd1ac430fe5de83a9af3a1ac8adf"/><file name="Mage_Page.csv" hash="fcce720263bf2fb11b78a467b297545d"/><file name="Mage_PageCache.csv" hash="4bd38621bb26a02a15251fcb37e1408b"/><file name="Mage_Paygate.csv" hash="311566b283975d5c481046346023026b"/><file name="Mage_Payment.csv" hash="5a0878ac6aa54689b3a8687197149c69"/><file name="Mage_Paypal.csv" hash="fe73439970f6d806c0ed0e0da05b6b51"/><file name="Mage_PaypalUk.csv" hash="d9d163d9c022d37e6bef2bf231469572"/><file name="Mage_Persistent.csv" hash="f84928d5a080bbfbb68f5becd12829c8"/><file name="Mage_Poll.csv" hash="01084dbcb43b1da9de35c5730fabd692"/><file name="Mage_ProductAlert.csv" hash="8ceb95248eeb2e4611d01767a7331840"/><file name="Mage_Rating.csv" hash="88db484c67afdb565255d210044bd034"/><file name="Mage_Reports.csv" hash="98f1525c2101c8557af6118e2dd48822"/><file name="Mage_Review.csv" hash="fd1b38a4863896e7112f642de243fdb8"/><file name="Mage_Rss.csv" hash="f99bd663f6b7becac87c8be1720f14b3"/><file name="Mage_Rule.csv" hash="0b655f98a5c7e98f672fcd04395c9a93"/><file name="Mage_Sales.csv" hash="f1b7dbe7bc3f7900683b3f2a2ba97b94"/><file name="Mage_SalesRule.csv" hash="9e6fbd2421b33de74d74fa9b4b8ede6b"/><file name="Mage_Sendfriend.csv" hash="b1e310cf2fdaf674de1e7604826146e9"/><file name="Mage_Shipping.csv" hash="136d55ce3ccf70bc2a1c7412085b40bc"/><file name="Mage_Sitemap.csv" hash="4837691c0e5c8cfbc4d75b10f196eb65"/><file name="Mage_Tag.csv" hash="211c99ac80a4b4e02b40a9907a4bc89a"/><file name="Mage_Tax.csv" hash="f5ec0e9f02d679d3600baf481a27b406"/><file name="Mage_Usa.csv" hash="518304e522d8d33e7fec565c7716bcba"/><file name="Mage_Weee.csv" hash="24bf654bb76513299a5cd227fed63f4a"/><file name="Mage_Widget.csv" hash="70a76519c347dd8f4209cb3dac849fe6"/><file name="Mage_Wishlist.csv" hash="8a27b7a9df533dc68f8f1df4338890fb"/><dir name="template"><dir name="email"><file name="account_new.html" hash="8d252c5b90acb75b02faab0325e68aed"/><file name="account_new_confirmation.html" hash="46a81d771b81c580872c15937a2f5fdd"/><file name="account_new_confirmed.html" hash="83e4c39f5d47cf4636ed8a5bca07e314"/><file name="account_password_reset_confirmation.html" hash="c811155d0c69f339b9a558dceb3c668a"/><file name="admin_password_new.html" hash="d2f3c73cb712d60da9384f1c5bfd31c0"/><file name="admin_password_reset_confirmation.html" hash="9e5c2fd7e57dcd19749cf27a9b41a9f4"/><file name="contact_form.html" hash="e04255e76e6e2d35f40d90ec5571d7e1"/><file name="currency_update_warning.html" hash="f6a4e8139468995c6561a12cd6cff860"/><file name="log_clean_warning.html" hash="0bd6a39803f8aa2eb46d6c110d8d0056"/><file name="newsletter_subscr_confirm.html" hash="f27b517857ba599274220a2f99384d89"/><file name="newsletter_subscr_success.html" hash="9179d85d345e2f2f48c13dd2578ddedd"/><file name="newsletter_unsub_success.html" hash="62704732a3ac8d6972949e17ee02ec79"/><file name="password_new.html" hash="696f240e0a22541d6e07f133fd16edab"/><file name="payment_failed.html" hash="977ad836e9fc377283c0efc820772105"/><file name="product_alert_cron_error.html" hash="edd49272b0b793941cd7138b253ae1b1"/><file name="product_price_alert.html" hash="4e881231e7e4acc729f3a74d7a29b6a8"/><file name="product_share.html" hash="151bc4ccbf64646abc917302c43a3b8f"/><file name="product_stock_alert.html" hash="1d90357122b3a4a86b17ae006b7993df"/><dir name="sales"><file name="creditmemo_new.html" hash="5038d00d70f8e1f19af7be32cb4f48ec"/><file name="creditmemo_new_guest.html" hash="0ab9b3502f83e2d3dca9f86b15377293"/><file name="creditmemo_update.html" hash="96b7addb6e2fed20ac0b10e30de79c5d"/><file name="creditmemo_update_guest.html" hash="3187860fe86c3afafa8994f274a4da20"/><file name="invoice_new.html" hash="e5774ea61dfa2bd89bb39d56c1a2c805"/><file name="invoice_new_guest.html" hash="f36ee8f3fff3af812b6e4d3455db46c2"/><file name="invoice_update.html" hash="57a58cf5aedff8339b75cb6938c81347"/><file name="invoice_update_guest.html" hash="39de992acddb54e9853d9cfca0ae042d"/><file name="order_new.html" hash="cc64b39d5b998807aae6463fa30998ca"/><file name="order_new_guest.html" hash="e0112ec1ec0423d7aeae9bb15babf697"/><file name="order_update.html" hash="aab9710b137a65a63a35421ae50db29f"/><file name="order_update_guest.html" hash="685614e83fc56c309bfbc3800ac5105b"/><file name="shipment_new.html" hash="bd6091f6080f7387e81989b6c3d44a0d"/><file name="shipment_new_guest.html" hash="6089497419c11440207ad092d9c8ae49"/><file name="shipment_update.html" hash="b6e286b85551f71d53ca54d82f52b92d"/><file name="shipment_update_guest.html" hash="46094d88f821f7c59dc9a7c9e2c779bc"/></dir><file name="sitemap_generate_warning.html" hash="d9c1ebf086e2f12dac31b18ab964daaa"/><file name="token.html" hash="cfb371e5b768794f096cb20e01c01f99"/><file name="wishlist_share.html" hash="f17e23109ee21989fb369975f76a3d86"/></dir></dir></dir></target></contents>
|
| 16 |
<compatible/>
|
| 17 |
<dependencies><required><php><min>5.2.0</min><max>6.0.0</max></php></required></dependencies>
|
| 18 |
</package>
|
