Version Notes
1.9.3.0
Download this release
Release Info
| Developer | Magento Core Team |
| Extension | Mage_Locale_en_US |
| Version | 1.9.3.0 |
| Comparing to | |
| See all releases | |
Code changes from version 1.9.2.4 to 1.9.3.0
- app/locale/en_US/Mage_Catalog.csv +4 -0
- app/locale/en_US/Mage_CatalogInventory.csv +1 -0
- app/locale/en_US/Mage_ConfigurableSwatches.csv +1 -0
- app/locale/en_US/Mage_Core.csv +2 -1
- app/locale/en_US/Mage_Customer.csv +12 -0
- app/locale/en_US/Mage_ImportExport.csv +1 -0
- app/locale/en_US/Mage_Media.csv +0 -1
- app/locale/en_US/Mage_Rss.csv +7 -0
- app/locale/en_US/Mage_Uploader.csv +9 -0
- app/locale/en_US/Mage_Usa.csv +3 -0
- app/locale/en_US/template/email/password_or_email_changed.html +34 -0
- package.xml +5 -5
app/locale/en_US/Mage_Catalog.csv
CHANGED
|
@@ -258,6 +258,7 @@
|
|
| 258 |
"Details","Details"
|
| 259 |
"Disabled","Disabled"
|
| 260 |
"Disallowed file type.","Disallowed file type."
|
|
|
|
| 261 |
"Display Actual Price","Display Actual Price"
|
| 262 |
"Display Page Control","Display Page Control"
|
| 263 |
"Display Price Interval as One Price","Display Price Interval as One Price"
|
|
@@ -407,6 +408,9 @@
|
|
| 407 |
"Maximum image width","Maximum image width"
|
| 408 |
"Maximum number of characters:","Maximum number of characters:"
|
| 409 |
"Maximum number of price intervals is 100","Maximum number of price intervals is 100"
|
|
|
|
|
|
|
|
|
|
| 410 |
"Maximum width base product image will be scaled down to in pixels","Maximum width base product image will be scaled down to in pixels"
|
| 411 |
"Maximum width small product image will be scaled down to in pixels","Maximum width small product image will be scaled down to in pixels"
|
| 412 |
"Media Image","Media Image"
|
| 258 |
"Details","Details"
|
| 259 |
"Disabled","Disabled"
|
| 260 |
"Disallowed file type.","Disallowed file type."
|
| 261 |
+
"Disalollowed file format.","Disalollowed file format."
|
| 262 |
"Display Actual Price","Display Actual Price"
|
| 263 |
"Display Page Control","Display Page Control"
|
| 264 |
"Display Price Interval as One Price","Display Price Interval as One Price"
|
| 408 |
"Maximum image width","Maximum image width"
|
| 409 |
"Maximum number of characters:","Maximum number of characters:"
|
| 410 |
"Maximum number of price intervals is 100","Maximum number of price intervals is 100"
|
| 411 |
+
"Maximum resolution for upload image","Maximum resolution for upload image"
|
| 412 |
+
"Maximum width and height dimension for upload image is %s.","Maximum width and height dimension for upload image is %s."
|
| 413 |
+
"Maximum width and height resolutions for upload image","Maximum width and height resolutions for upload image"
|
| 414 |
"Maximum width base product image will be scaled down to in pixels","Maximum width base product image will be scaled down to in pixels"
|
| 415 |
"Maximum width small product image will be scaled down to in pixels","Maximum width small product image will be scaled down to in pixels"
|
| 416 |
"Media Image","Media Image"
|
app/locale/en_US/Mage_CatalogInventory.csv
CHANGED
|
@@ -42,6 +42,7 @@
|
|
| 42 |
"Rule price","Rule price"
|
| 43 |
"Set Items' Status to be In Stock When Order is Cancelled","Set Items' Status to be In Stock When Order is Cancelled"
|
| 44 |
"Some of the products are currently out of stock.","Some of the products are currently out of stock."
|
|
|
|
| 45 |
"Some of the products cannot be ordered in requested quantity.","Some of the products cannot be ordered in requested quantity."
|
| 46 |
"Some of the products cannot be ordered in the requested quantity.","Some of the products cannot be ordered in the requested quantity."
|
| 47 |
"Stock Options","Stock Options"
|
| 42 |
"Rule price","Rule price"
|
| 43 |
"Set Items' Status to be In Stock When Order is Cancelled","Set Items' Status to be In Stock When Order is Cancelled"
|
| 44 |
"Some of the products are currently out of stock.","Some of the products are currently out of stock."
|
| 45 |
+
"Some of the products are not available","Some of the products are not available"
|
| 46 |
"Some of the products cannot be ordered in requested quantity.","Some of the products cannot be ordered in requested quantity."
|
| 47 |
"Some of the products cannot be ordered in the requested quantity.","Some of the products cannot be ordered in the requested quantity."
|
| 48 |
"Stock Options","Stock Options"
|
app/locale/en_US/Mage_ConfigurableSwatches.csv
CHANGED
|
@@ -2,6 +2,7 @@
|
|
| 2 |
"Add to Cart","Add to Cart"
|
| 3 |
"Choose an Option...","Choose an Option..."
|
| 4 |
"Configurable Swatches","Configurable Swatches"
|
|
|
|
| 5 |
"Enabled","Enabled"
|
| 6 |
"General Settings","General Settings"
|
| 7 |
"Height","Height"
|
| 2 |
"Add to Cart","Add to Cart"
|
| 3 |
"Choose an Option...","Choose an Option..."
|
| 4 |
"Configurable Swatches","Configurable Swatches"
|
| 5 |
+
"Dynamic Price Change for Swatches in Product Listing","Dynamic Price Change for Swatches in Product Listing"
|
| 6 |
"Enabled","Enabled"
|
| 7 |
"General Settings","General Settings"
|
| 8 |
"Height","Height"
|
app/locale/en_US/Mage_Core.csv
CHANGED
|
@@ -219,7 +219,7 @@
|
|
| 219 |
"Path ""%value%"" is protected and cannot be used.","Path ""%value%"" is protected and cannot be used."
|
| 220 |
"Path ""%value%"" may not include parent directory traversal (""../"", ""..\\).""","Path ""%value%"" may not include parent directory traversal (""../"", ""..\\)."""
|
| 221 |
"Please define flag code.","Please define flag code."
|
| 222 |
-
"Please enter 6 or more characters
|
| 223 |
"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Please enter 7 or more characters. Password should contain both numeric and alphabetic characters."
|
| 224 |
"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
|
| 225 |
"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
|
|
@@ -270,6 +270,7 @@
|
|
| 270 |
"Port (25)","Port (25)"
|
| 271 |
"Profiler","Profiler"
|
| 272 |
"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
|
|
|
|
| 273 |
"Request Path for Specified Store","Request Path for Specified Store"
|
| 274 |
"Request path length exceeds allowed %s symbols.","Request path length exceeds allowed %s symbols."
|
| 275 |
"Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","Requested file may not include parent directory traversal (""../"", ""..\\ notation)"""
|
| 219 |
"Path ""%value%"" is protected and cannot be used.","Path ""%value%"" is protected and cannot be used."
|
| 220 |
"Path ""%value%"" may not include parent directory traversal (""../"", ""..\\).""","Path ""%value%"" may not include parent directory traversal (""../"", ""..\\)."""
|
| 221 |
"Please define flag code.","Please define flag code."
|
| 222 |
+
"Please enter 6 or more characters without leading or trailing spaces.","Please enter 6 or more characters without leading or trailing spaces."
|
| 223 |
"Please enter 7 or more characters. Password should contain both numeric and alphabetic characters.","Please enter 7 or more characters. Password should contain both numeric and alphabetic characters."
|
| 224 |
"Please enter a number 0 or greater in this field.","Please enter a number 0 or greater in this field."
|
| 225 |
"Please enter a number 1 or greater in this field.","Please enter a number 1 or greater in this field."
|
| 270 |
"Port (25)","Port (25)"
|
| 271 |
"Profiler","Profiler"
|
| 272 |
"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
|
| 273 |
+
"Recovery Link Expiration Period (hours)","Recovery Link Expiration Period (hours)"
|
| 274 |
"Request Path for Specified Store","Request Path for Specified Store"
|
| 275 |
"Request path length exceeds allowed %s symbols.","Request path length exceeds allowed %s symbols."
|
| 276 |
"Requested file may not include parent directory traversal (""../"", ""..\\ notation)""","Requested file may not include parent directory traversal (""../"", ""..\\ notation)"""
|
app/locale/en_US/Mage_Customer.csv
CHANGED
|
@@ -50,6 +50,9 @@
|
|
| 50 |
"Based on the VAT ID, the customer would belong to the Customer Group %s.","Based on the VAT ID, the customer would belong to the Customer Group %s."
|
| 51 |
"Bill to Name","Bill to Name"
|
| 52 |
"Bought From","Bought From"
|
|
|
|
|
|
|
|
|
|
| 53 |
"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more."
|
| 54 |
"CSV","CSV"
|
| 55 |
"Cancel","Cancel"
|
|
@@ -57,10 +60,13 @@
|
|
| 57 |
"Cannot save address.","Cannot save address."
|
| 58 |
"Cannot save the customer.","Cannot save the customer."
|
| 59 |
"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged."
|
|
|
|
| 60 |
"Change Account Password","Change Account Password"
|
| 61 |
"Change Billing Address","Change Billing Address"
|
| 62 |
"Change Password","Change Password"
|
| 63 |
"Change Shipping Address","Change Shipping Address"
|
|
|
|
|
|
|
| 64 |
"City","City"
|
| 65 |
"Company","Company"
|
| 66 |
"Config","Config"
|
|
@@ -155,6 +161,9 @@
|
|
| 155 |
"Forgot Your Password","Forgot Your Password"
|
| 156 |
"Forgot Your Password?","Forgot Your Password?"
|
| 157 |
"Forgot and Remind Email Sender","Forgot and Remind Email Sender"
|
|
|
|
|
|
|
|
|
|
| 158 |
"Form Fields Before","Form Fields Before"
|
| 159 |
"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information."
|
| 160 |
"Gender","Gender"
|
|
@@ -300,6 +309,7 @@
|
|
| 300 |
"Recent Orders","Recent Orders"
|
| 301 |
"Records for %s store found.","Records for %s store found."
|
| 302 |
"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
|
|
|
|
| 303 |
"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
|
| 304 |
"Refunded","Refunded"
|
| 305 |
"Register","Register"
|
|
@@ -451,6 +461,8 @@
|
|
| 451 |
"You are currently subscribed to 'General Subscription'.","You are currently subscribed to 'General Subscription'."
|
| 452 |
"You are currently subscribed to our newsletter.","You are currently subscribed to our newsletter."
|
| 453 |
"You are now logged out","You are now logged out"
|
|
|
|
|
|
|
| 454 |
"You have logged out and will be redirected to our homepage in 5 seconds.","You have logged out and will be redirected to our homepage in 5 seconds."
|
| 455 |
"You have no additional address entries in your address book.","You have no additional address entries in your address book."
|
| 456 |
"You have no additional entries in your address book.","You have no additional entries in your address book."
|
| 50 |
"Based on the VAT ID, the customer would belong to the Customer Group %s.","Based on the VAT ID, the customer would belong to the Customer Group %s."
|
| 51 |
"Bill to Name","Bill to Name"
|
| 52 |
"Bought From","Bought From"
|
| 53 |
+
"By Email","By Email"
|
| 54 |
+
"By IP","By IP"
|
| 55 |
+
"By IP and Email","By IP and Email"
|
| 56 |
"By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more.","By creating an account with our store, you will be able to move through the checkout process faster, store multiple shipping addresses, view and track your orders in your account and more."
|
| 57 |
"CSV","CSV"
|
| 58 |
"Cancel","Cancel"
|
| 60 |
"Cannot save address.","Cannot save address."
|
| 61 |
"Cannot save the customer.","Cannot save the customer."
|
| 62 |
"Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged.","Cannot share customer accounts globally because some customer accounts with the same emails exist on multiple websites and cannot be merged."
|
| 63 |
+
"Change Account Data","Change Account Data"
|
| 64 |
"Change Account Password","Change Account Password"
|
| 65 |
"Change Billing Address","Change Billing Address"
|
| 66 |
"Change Password","Change Password"
|
| 67 |
"Change Shipping Address","Change Shipping Address"
|
| 68 |
+
"Changed Email or Password Email Template","Changed Email or Password Email Template"
|
| 69 |
+
"Changed Password or Email","Changed Password or Email"
|
| 70 |
"City","City"
|
| 71 |
"Company","Company"
|
| 72 |
"Config","Config"
|
| 161 |
"Forgot Your Password","Forgot Your Password"
|
| 162 |
"Forgot Your Password?","Forgot Your Password?"
|
| 163 |
"Forgot and Remind Email Sender","Forgot and Remind Email Sender"
|
| 164 |
+
"Forgot password flow secure","Forgot password flow secure"
|
| 165 |
+
"Forgot password requests to times per 24 hours from 1 e-mail","Forgot password requests to times per 24 hours from 1 e-mail"
|
| 166 |
+
"Forgot password requests to times per hour from 1 IP","Forgot password requests to times per hour from 1 IP"
|
| 167 |
"Form Fields Before","Form Fields Before"
|
| 168 |
"From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information.","From your My Account Dashboard you have the ability to view a snapshot of your recent account activity and update your account information. Select a link below to view or edit information."
|
| 169 |
"Gender","Gender"
|
| 309 |
"Recent Orders","Recent Orders"
|
| 310 |
"Records for %s store found.","Records for %s store found."
|
| 311 |
"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
|
| 312 |
+
"Recovery Link Expiration Period (hours)","Recovery Link Expiration Period (hours)"
|
| 313 |
"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
|
| 314 |
"Refunded","Refunded"
|
| 315 |
"Register","Register"
|
| 461 |
"You are currently subscribed to 'General Subscription'.","You are currently subscribed to 'General Subscription'."
|
| 462 |
"You are currently subscribed to our newsletter.","You are currently subscribed to our newsletter."
|
| 463 |
"You are now logged out","You are now logged out"
|
| 464 |
+
"You have exceeded requests to times per 24 hours from 1 e-mail.","You have exceeded requests to times per 24 hours from 1 e-mail."
|
| 465 |
+
"You have exceeded requests to times per hour from 1 IP.","You have exceeded requests to times per hour from 1 IP."
|
| 466 |
"You have logged out and will be redirected to our homepage in 5 seconds.","You have logged out and will be redirected to our homepage in 5 seconds."
|
| 467 |
"You have no additional address entries in your address book.","You have no additional address entries in your address book."
|
| 468 |
"You have no additional entries in your address book.","You have no additional entries in your address book."
|
app/locale/en_US/Mage_ImportExport.csv
CHANGED
|
@@ -55,6 +55,7 @@
|
|
| 55 |
"Header column names already set","Header column names already set"
|
| 56 |
"Import","Import"
|
| 57 |
"Import Behavior","Import Behavior"
|
|
|
|
| 58 |
"Import Settings","Import Settings"
|
| 59 |
"Import has been done successfuly.","Import has been done successfuly."
|
| 60 |
"Import successfully done.","Import successfully done."
|
| 55 |
"Header column names already set","Header column names already set"
|
| 56 |
"Import","Import"
|
| 57 |
"Import Behavior","Import Behavior"
|
| 58 |
+
"Import CSV","Import CSV"
|
| 59 |
"Import Settings","Import Settings"
|
| 60 |
"Import has been done successfuly.","Import has been done successfuly."
|
| 61 |
"Import successfully done.","Import successfully done."
|
app/locale/en_US/Mage_Media.csv
CHANGED
|
@@ -1,3 +1,2 @@
|
|
| 1 |
"An error occurred while creating the image.","An error occurred while creating the image."
|
| 2 |
"The image does not exist or is invalid.","The image does not exist or is invalid."
|
| 3 |
-
"This content requires last version of Adobe Flash Player. <a href=""%s"">Get Flash</a>","This content requires last version of Adobe Flash Player. <a href=""%s"">Get Flash</a>"
|
| 1 |
"An error occurred while creating the image.","An error occurred while creating the image."
|
| 2 |
"The image does not exist or is invalid.","The image does not exist or is invalid."
|
|
|
app/locale/en_US/Mage_Rss.csv
CHANGED
|
@@ -3,6 +3,8 @@
|
|
| 3 |
"%s RSS Feed","%s RSS Feed"
|
| 4 |
"%s has reached a quantity of %s.","%s has reached a quantity of %s."
|
| 5 |
"%s\'s Wishlist","%s\'s Wishlist"
|
|
|
|
|
|
|
| 6 |
"Cannot retrieve the wishlist","Cannot retrieve the wishlist"
|
| 7 |
"Catalog","Catalog"
|
| 8 |
"Category Feeds","Category Feeds"
|
|
@@ -11,6 +13,7 @@
|
|
| 11 |
"Coupons/Discounts","Coupons/Discounts"
|
| 12 |
"Current Status: %s<br/>","Current Status: %s<br/>"
|
| 13 |
"Customer Name: %s","Customer Name: %s"
|
|
|
|
| 14 |
"Customer Order Status Notification","Customer Order Status Notification"
|
| 15 |
"Details for %s #%s","Details for %s #%s"
|
| 16 |
"Discount","Discount"
|
|
@@ -24,10 +27,12 @@
|
|
| 24 |
"Low Stock Products","Low Stock Products"
|
| 25 |
"Message:","Message:"
|
| 26 |
"Miscellaneous Feeds","Miscellaneous Feeds"
|
|
|
|
| 27 |
"New Orders","New Orders"
|
| 28 |
"New Products","New Products"
|
| 29 |
"New Products from %s","New Products from %s"
|
| 30 |
"Notified Date: %s<br/>","Notified Date: %s<br/>"
|
|
|
|
| 31 |
"Order # %s Notification(s)","Order # %s Notification(s)"
|
| 32 |
"Order #%s created at %s","Order #%s created at %s"
|
| 33 |
"Pending product review(s)","Pending product review(s)"
|
|
@@ -39,10 +44,12 @@
|
|
| 39 |
"RSS Feeds","RSS Feeds"
|
| 40 |
"RSS Feeds List","RSS Feeds List"
|
| 41 |
"RSS Feeds Section","RSS Feeds Section"
|
|
|
|
| 42 |
"Review: %s <br/>","Review: %s <br/>"
|
| 43 |
"Rss Config","Rss Config"
|
| 44 |
"Shipping & Handling","Shipping & Handling"
|
| 45 |
"Special Products","Special Products"
|
|
|
|
| 46 |
"Store: %s <br/>","Store: %s <br/>"
|
| 47 |
"Subtotal","Subtotal"
|
| 48 |
"Summary of review: %s <br/>","Summary of review: %s <br/>"
|
| 3 |
"%s RSS Feed","%s RSS Feed"
|
| 4 |
"%s has reached a quantity of %s.","%s has reached a quantity of %s."
|
| 5 |
"%s\'s Wishlist","%s\'s Wishlist"
|
| 6 |
+
"Admin Catalog","Admin Catalog"
|
| 7 |
+
"Admin Order","Admin Order"
|
| 8 |
"Cannot retrieve the wishlist","Cannot retrieve the wishlist"
|
| 9 |
"Catalog","Catalog"
|
| 10 |
"Category Feeds","Category Feeds"
|
| 13 |
"Coupons/Discounts","Coupons/Discounts"
|
| 14 |
"Current Status: %s<br/>","Current Status: %s<br/>"
|
| 15 |
"Customer Name: %s","Customer Name: %s"
|
| 16 |
+
"Customer Order Notification","Customer Order Notification"
|
| 17 |
"Customer Order Status Notification","Customer Order Status Notification"
|
| 18 |
"Details for %s #%s","Details for %s #%s"
|
| 19 |
"Discount","Discount"
|
| 27 |
"Low Stock Products","Low Stock Products"
|
| 28 |
"Message:","Message:"
|
| 29 |
"Miscellaneous Feeds","Miscellaneous Feeds"
|
| 30 |
+
"New Order Notification","New Order Notification"
|
| 31 |
"New Orders","New Orders"
|
| 32 |
"New Products","New Products"
|
| 33 |
"New Products from %s","New Products from %s"
|
| 34 |
"Notified Date: %s<br/>","Notified Date: %s<br/>"
|
| 35 |
+
"Order","Order"
|
| 36 |
"Order # %s Notification(s)","Order # %s Notification(s)"
|
| 37 |
"Order #%s created at %s","Order #%s created at %s"
|
| 38 |
"Pending product review(s)","Pending product review(s)"
|
| 44 |
"RSS Feeds","RSS Feeds"
|
| 45 |
"RSS Feeds List","RSS Feeds List"
|
| 46 |
"RSS Feeds Section","RSS Feeds Section"
|
| 47 |
+
"Review Notification","Review Notification"
|
| 48 |
"Review: %s <br/>","Review: %s <br/>"
|
| 49 |
"Rss Config","Rss Config"
|
| 50 |
"Shipping & Handling","Shipping & Handling"
|
| 51 |
"Special Products","Special Products"
|
| 52 |
+
"Stock Notification","Stock Notification"
|
| 53 |
"Store: %s <br/>","Store: %s <br/>"
|
| 54 |
"Subtotal","Subtotal"
|
| 55 |
"Summary of review: %s <br/>","Summary of review: %s <br/>"
|
app/locale/en_US/Mage_Uploader.csv
ADDED
|
@@ -0,0 +1,9 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
"...","..."
|
| 2 |
+
"Browse Files...","Browse Files..."
|
| 3 |
+
"Complete","Complete"
|
| 4 |
+
"Maximum allowed file size for upload is","Maximum allowed file size for upload is"
|
| 5 |
+
"Please check your server PHP settings.","Please check your server PHP settings."
|
| 6 |
+
"Remove","Remove"
|
| 7 |
+
"There are files that were selected but not uploaded yet. After switching to another tab your selections will be lost. Do you wish to continue ?","There are files that were selected but not uploaded yet. After switching to another tab your selections will be lost. Do you wish to continue ?"
|
| 8 |
+
"Upload Files","Upload Files"
|
| 9 |
+
"Uploading...","Uploading..."
|
app/locale/en_US/Mage_Usa.csv
CHANGED
|
@@ -66,6 +66,7 @@
|
|
| 66 |
"Economy select","Economy select"
|
| 67 |
"Empty response","Empty response"
|
| 68 |
"Enable Negotiated Rates","Enable Negotiated Rates"
|
|
|
|
| 69 |
"Enabled for Checkout","Enabled for Checkout"
|
| 70 |
"Enables/Disables SSL verification of Magento server by UPS.","Enables/Disables SSL verification of Magento server by UPS."
|
| 71 |
"Error #%s : %s","Error #%s : %s"
|
|
@@ -99,8 +100,10 @@
|
|
| 99 |
"First-Class Mail Large Envelope","First-Class Mail Large Envelope"
|
| 100 |
"First-Class Mail Large Postcards","First-Class Mail Large Postcards"
|
| 101 |
"First-Class Mail Letter","First-Class Mail Letter"
|
|
|
|
| 102 |
"First-Class Mail Parcel","First-Class Mail Parcel"
|
| 103 |
"First-Class Mail Postcards","First-Class Mail Postcards"
|
|
|
|
| 104 |
"First-Class Package International Service","First-Class Package International Service"
|
| 105 |
"First-Class Package Service","First-Class Package Service"
|
| 106 |
"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup"
|
| 66 |
"Economy select","Economy select"
|
| 67 |
"Empty response","Empty response"
|
| 68 |
"Enable Negotiated Rates","Enable Negotiated Rates"
|
| 69 |
+
"Enable SSL Verification","Enable SSL Verification"
|
| 70 |
"Enabled for Checkout","Enabled for Checkout"
|
| 71 |
"Enables/Disables SSL verification of Magento server by UPS.","Enables/Disables SSL verification of Magento server by UPS."
|
| 72 |
"Error #%s : %s","Error #%s : %s"
|
| 100 |
"First-Class Mail Large Envelope","First-Class Mail Large Envelope"
|
| 101 |
"First-Class Mail Large Postcards","First-Class Mail Large Postcards"
|
| 102 |
"First-Class Mail Letter","First-Class Mail Letter"
|
| 103 |
+
"First-Class Mail Metered Letter","First-Class Mail Metered Letter"
|
| 104 |
"First-Class Mail Parcel","First-Class Mail Parcel"
|
| 105 |
"First-Class Mail Postcards","First-Class Mail Postcards"
|
| 106 |
+
"First-Class Mail Stamped Letter","First-Class Mail Stamped Letter"
|
| 107 |
"First-Class Package International Service","First-Class Package International Service"
|
| 108 |
"First-Class Package Service","First-Class Package Service"
|
| 109 |
"First-Class Package Service Hold For Pickup","First-Class Package Service Hold For Pickup"
|
app/locale/en_US/template/email/password_or_email_changed.html
ADDED
|
@@ -0,0 +1,34 @@
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
+
<!--@subject Your password or email changed at {{var store.getFrontendName()}} @-->
|
| 2 |
+
<!--@vars
|
| 3 |
+
{"store url=\"\"":"Store Url",
|
| 4 |
+
"var logo_url":"Email Logo Image Url",
|
| 5 |
+
"var logo_alt":"Email Logo Image Alt",
|
| 6 |
+
"store url=\"customer/account/\"":"Customer Account Url",
|
| 7 |
+
"var customer.email":"Customer Email",
|
| 8 |
+
"var customer.is_change_email":"Customer Flag Email Change",
|
| 9 |
+
"var customer.is_change_password":"Customer Flag Password Change",
|
| 10 |
+
"htmlescape var=$customer.name":"Customer Name"}
|
| 11 |
+
@-->
|
| 12 |
+
<!--@styles
|
| 13 |
+
@-->
|
| 14 |
+
|
| 15 |
+
{{template config_path="design/email/header"}}
|
| 16 |
+
{{inlinecss file="email-inline.css"}}
|
| 17 |
+
|
| 18 |
+
<table cellpadding="0" cellspacing="0" border="0">
|
| 19 |
+
<tr>
|
| 20 |
+
<td class="action-content">
|
| 21 |
+
<h1>Hello {{htmlescape var=$customer.name}},</h1>
|
| 22 |
+
{{if customer.is_change_password}}
|
| 23 |
+
<p>We have received a request to change password associated with your account at {{var store.getFrontendName()}}.</p>
|
| 24 |
+
{{/if}}
|
| 25 |
+
{{if customer.is_change_email}}
|
| 26 |
+
<br>We have received a request to change email associated with your account at {{var store.getFrontendName()}}.<br />
|
| 27 |
+
<strong>Your new email is:</strong> {{var customer.email}}</p>
|
| 28 |
+
{{/if}}
|
| 29 |
+
<p>If you have not authorized this action, please contact us immediately {{depend store_phone}} at <a href="tel:{{var store_phone}}">{{var store_phone}}</a>{{/depend}}.</p>
|
| 30 |
+
</td>
|
| 31 |
+
</tr>
|
| 32 |
+
</table>
|
| 33 |
+
|
| 34 |
+
{{template config_path="design/email/footer"}}
|
package.xml
CHANGED
|
@@ -1,18 +1,18 @@
|
|
| 1 |
<?xml version="1.0"?>
|
| 2 |
<package>
|
| 3 |
<name>Mage_Locale_en_US</name>
|
| 4 |
-
<version>1.9.
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>en_US locale</summary>
|
| 10 |
<description>en_US locale</description>
|
| 11 |
-
<notes>1.9.
|
| 12 |
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
-
<date>2016-
|
| 14 |
-
<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="8a0263be85d7ac77e54d6044dcfc6420"/><file name="Mage_Captcha.csv" hash="de6aef08396245ed644b213ecfcf309b"/><file name="Mage_Catalog.csv" hash="
|
| 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.9.3.0</version>
|
| 5 |
<stability>stable</stability>
|
| 6 |
<license uri="http://opensource.org/licenses/afl-3.0.php">AFL v3.0</license>
|
| 7 |
<channel>community</channel>
|
| 8 |
<extends/>
|
| 9 |
<summary>en_US locale</summary>
|
| 10 |
<description>en_US locale</description>
|
| 11 |
+
<notes>1.9.3.0</notes>
|
| 12 |
<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
|
| 13 |
+
<date>2016-10-04</date>
|
| 14 |
+
<time>13:04:46</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="8a0263be85d7ac77e54d6044dcfc6420"/><file name="Mage_Captcha.csv" hash="de6aef08396245ed644b213ecfcf309b"/><file name="Mage_Catalog.csv" hash="8cca8007283b4344f07fd489f90dd4f9"/><file name="Mage_CatalogInventory.csv" hash="d3692d562e917fd71b5944aa050648c7"/><file name="Mage_CatalogRule.csv" hash="c7dcdd7d6192fbbbee177aaeb56b1685"/><file name="Mage_CatalogSearch.csv" hash="9a4687677cd0ff4ce75ead38b69fc2fc"/><file name="Mage_Checkout.csv" hash="8a696bdea184cbb1b6c7da04f66bb339"/><file name="Mage_Cms.csv" hash="9a538e344acce7afa686fbed65082c63"/><file name="Mage_ConfigurableSwatches.csv" hash="8d9ad57fa2b4012dbb49e6dfebfeadba"/><file name="Mage_Connect.csv" hash="8cd1b22e3bb2b18a59b6bfb6a7e4e7f9"/><file name="Mage_Contacts.csv" hash="7e367e9a924c19b6df2fa5c8adca9be4"/><file name="Mage_Core.csv" hash="f93a11641f44bcfab39ac668f667c22a"/><file name="Mage_Cron.csv" hash="f963e0b41f877519fd8f6e723f25ee3c"/><file name="Mage_CurrencySymbol.csv" hash="2cc13530e2f9387349c6a162d4d22bc9"/><file name="Mage_Customer.csv" hash="ef6ba18824e652b6577a770dee35c5be"/><file name="Mage_Dataflow.csv" hash="02ddb4090005e6678f020ac96c2cbe81"/><file name="Mage_Directory.csv" hash="83f83f81a84aafce6f0d8e731e87653e"/><file name="Mage_Downloadable.csv" hash="05085f8d10c4df507ad96790a0f4f31a"/><file name="Mage_Eav.csv" hash="9b9e7506f519e45f5a9b44355425f04b"/><file name="Mage_GiftMessage.csv" hash="6cd672267af7f7183f47c58450c2779a"/><file name="Mage_GoogleAnalytics.csv" hash="c8a08b1e094bdf42d8222c97241296c2"/><file name="Mage_GoogleBase.csv" hash="453420e7b2a7c67d983436cd07c3f1c1"/><file name="Mage_GoogleCheckout.csv" hash="218bdb6351129bc11f5fbb7abeff7e18"/><file name="Mage_ImportExport.csv" hash="4a2aa89fcf08adc9616187465abf57a6"/><file name="Mage_Index.csv" hash="a12d6e56dec19a45380375e7ea3f7a7c"/><file name="Mage_Install.csv" hash="ff1231e1db62fc550cac4674d0ba5190"/><file name="Mage_Log.csv" hash="302d7736324e74584e23ea35289e5593"/><file name="Mage_Media.csv" hash="9d16c10b1ba6569a972018353d17f471"/><file name="Mage_Newsletter.csv" hash="85bd38e7b398fed22997f9bd87f7afa1"/><file name="Mage_Oauth.csv" hash="53c0c0f9390456fd1be2df79ed995a61"/><file name="Mage_Page.csv" hash="6bc4823d5da7038bbca8d34190e44010"/><file name="Mage_PageCache.csv" hash="365e8f2f9dace7313711e9a27d27cd97"/><file name="Mage_Paygate.csv" hash="311566b283975d5c481046346023026b"/><file name="Mage_Payment.csv" hash="4f42a6296fada9e8a3dbccf19d143fce"/><file name="Mage_Paypal.csv" hash="1df7ff2e0a9957243cdef854551fad70"/><file name="Mage_PaypalUk.csv" hash="d9d163d9c022d37e6bef2bf231469572"/><file name="Mage_Persistent.csv" hash="8df1299e4ddacadd638b7dd2f66749da"/><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="c49ae3155e93f7eff90b3058ec8e7b40"/><file name="Mage_Review.csv" hash="a251b73a3f358bcdd93cfde7f0a2f10f"/><file name="Mage_Rss.csv" hash="56b9be44d2cb98a43bf0e04007fa98d6"/><file name="Mage_Rule.csv" hash="a6a968b628d92b7f172801ce05755962"/><file name="Mage_Sales.csv" hash="d819588fd9a0eccc737b8a70ecac6cbc"/><file name="Mage_SalesRule.csv" hash="1703499a655a66855f2fa13597c09587"/><file name="Mage_Sendfriend.csv" hash="b1e310cf2fdaf674de1e7604826146e9"/><file name="Mage_Shipping.csv" hash="1c64b4423ab6fd12c0c9e2d05a80c570"/><file name="Mage_Sitemap.csv" hash="4837691c0e5c8cfbc4d75b10f196eb65"/><file name="Mage_Tag.csv" hash="d37771ca3a2321a6f1dd6c59a378981b"/><file name="Mage_Tax.csv" hash="a0665ad32147d01fec271dc8d2ee12d1"/><file name="Mage_Uploader.csv" hash="044e66927e4a70710e2d5e27105ad308"/><file name="Mage_Usa.csv" hash="30c85222f0c26a629e7235fe6d3dfa3e"/><file name="Mage_Weee.csv" hash="60f8a4821b2733ba6b16cba691d3ada6"/><file name="Mage_Widget.csv" hash="01127964a87c48113af4b8969e795aa6"/><file name="Mage_Wishlist.csv" hash="95cdb9f8dc1b8a96e0e8e54f7382ba93"/><dir name="template"><dir name="email"><file name="account_new.html" hash="c7516c316c9fd94aeb4a007adb42b47c"/><file name="account_new_confirmation.html" hash="c404affe58ec3947379beabf6cf2dee9"/><file name="account_new_confirmed.html" hash="19223ed36f7076dee12a8fc6f542f00f"/><file name="account_password_reset_confirmation.html" hash="d21f5b26557dfbafda0b5d0d29e78803"/><file name="admin_password_new.html" hash="e0cb7a16e03f1e57fc42fa3b60920bb2"/><file name="admin_password_reset_confirmation.html" hash="385547f1fd11e85b6cd818e91f519bfd"/><file name="contact_form.html" hash="ee7a957b249d9bf8d2f84787d9276958"/><file name="currency_update_warning.html" hash="be68b2b00692c3071942df42d206575f"/><dir name="html"><file name="footer.html" hash="72d4ef13825ca2143557f5baf67c27cf"/><file name="header.html" hash="739a3ea8e07bbe3be76e4c93237bc5d2"/></dir><file name="log_clean_warning.html" hash="36eb1af6eca088bdafe6e91c5a355a98"/><file name="newsletter_subscr_confirm.html" hash="cc7849aaa2ada032e0d0cbcdc4c15222"/><file name="newsletter_subscr_success.html" hash="83fc3c7d1cae23c24561f803e41ea988"/><file name="newsletter_unsub_success.html" hash="3bd611af2d1fae78622e6217ff2b189e"/><file name="password_new.html" hash="e633e5d80e81549e29b239960f5187cb"/><file name="password_or_email_changed.html" hash="26ce55df2b817a5ed2373c71feff3652"/><file name="payment_failed.html" hash="693051923f748ed9e695c0b300597034"/><file name="product_alert_cron_error.html" hash="8ea80affba71491f4371b0524d0c3399"/><file name="product_price_alert.html" hash="18ff254fcaea714647caf21b39d36e9b"/><file name="product_share.html" hash="02c76a3380f98aaaa9c3ac6a86da3545"/><file name="product_stock_alert.html" hash="6a0fc4ef5203e195d1a0957accc1fca3"/><dir name="sales"><file name="creditmemo_new.html" hash="c487a7c825477974835891019d2b55bd"/><file name="creditmemo_new_guest.html" hash="47dc131ea102b0cf72d1e8bb50df2514"/><file name="creditmemo_update.html" hash="4dd0fedbe075abc51dd3647bedbf051a"/><file name="creditmemo_update_guest.html" hash="d805b77120143a070d44a01866df8f3f"/><file name="invoice_new.html" hash="0bfd2645ebb5289edcef0ae6fc7f93de"/><file name="invoice_new_guest.html" hash="0bfd2645ebb5289edcef0ae6fc7f93de"/><file name="invoice_update.html" hash="1ced4397da53d8a73bfa854b1ce60c24"/><file name="invoice_update_guest.html" hash="f8e7d66c9d607f3a349a9c21544c9854"/><file name="order_new.html" hash="f3ce547016c4d497805360460c6c5ec3"/><file name="order_new_guest.html" hash="f3ce547016c4d497805360460c6c5ec3"/><file name="order_update.html" hash="8d8d3f6a5831909532984817afc81647"/><file name="order_update_guest.html" hash="04ffcc29c74931d5f46b6ecb25cc049e"/><file name="shipment_new.html" hash="1a8e314cada334caffe213efd1e5ce31"/><file name="shipment_new_guest.html" hash="6ba64b3b35a39bfcc4c3d0ff4acc6fad"/><file name="shipment_update.html" hash="4425c3dfceb25ea1a5b80fd054a0f79f"/><file name="shipment_update_guest.html" hash="45b6f10c6853a36879b17f86e761edbf"/></dir><file name="sitemap_generate_warning.html" hash="7eb47e4ddd7eab22272397cff8c9441d"/><file name="token.html" hash="71f392398f6f80481b2e0edba7cefc78"/><file name="wishlist_share.html" hash="8d4d4838c76468c2be6149f5314b27a6"/></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>
|
