Mage_Locale_en_US - Version 1.9.1.0

Version Notes

1.9.1.0

Release Info

Developer	Magento Core Team
Extension	Mage_Locale_en_US
Version	1.9.1.0
Comparing to
See all releases

Code changes from version 1.9.0.0 to 1.9.1.0

Files changed (68) hide show

app/locale/en_US/Mage_Bundle.csv +1 -1
app/locale/en_US/Mage_Catalog.csv +14 -12
app/locale/en_US/Mage_CatalogInventory.csv +3 -0
app/locale/en_US/Mage_CatalogRule.csv +0 -4
app/locale/en_US/Mage_Checkout.csv +28 -1
app/locale/en_US/Mage_ConfigurableSwatches.csv +18 -0
app/locale/en_US/Mage_Core.csv +9 -1
app/locale/en_US/Mage_Cron.csv +0 -8
app/locale/en_US/Mage_Customer.csv +3 -3
app/locale/en_US/Mage_Directory.csv +2 -1
app/locale/en_US/Mage_Downloadable.csv +4 -0
app/locale/en_US/Mage_GoogleAnalytics.csv +2 -0
app/locale/en_US/Mage_Oauth.csv +1 -0
app/locale/en_US/Mage_Page.csv +8 -3
app/locale/en_US/Mage_PageCache.csv +0 -1
app/locale/en_US/Mage_Paygate.csv +0 -1
app/locale/en_US/Mage_Payment.csv +1 -5
app/locale/en_US/Mage_Paypal.csv +114 -32
app/locale/en_US/Mage_Persistent.csv +12 -0
app/locale/en_US/Mage_Review.csv +8 -0
app/locale/en_US/Mage_Rule.csv +0 -10
app/locale/en_US/Mage_Sales.csv +5 -6
app/locale/en_US/Mage_SalesRule.csv +1 -0
app/locale/en_US/Mage_Shipping.csv +0 -1
app/locale/en_US/Mage_Tax.csv +2 -0
app/locale/en_US/Mage_Usa.csv +2 -8
app/locale/en_US/Mage_Weee.csv +0 -2
app/locale/en_US/Mage_Wishlist.csv +4 -3
app/locale/en_US/template/email/account_new.html +32 -42
app/locale/en_US/template/email/account_new_confirmation.html +37 -35
app/locale/en_US/template/email/account_new_confirmed.html +27 -39
app/locale/en_US/template/email/account_password_reset_confirmation.html +22 -31
app/locale/en_US/template/email/admin_password_new.html +10 -26
app/locale/en_US/template/email/admin_password_reset_confirmation.html +23 -31
app/locale/en_US/template/email/contact_form.html +1 -1
app/locale/en_US/template/email/currency_update_warning.html +2 -3
app/locale/en_US/template/email/html/footer.html +11 -0
app/locale/en_US/template/email/html/header.html +45 -0
app/locale/en_US/template/email/log_clean_warning.html +1 -1
app/locale/en_US/template/email/newsletter_subscr_confirm.html +12 -22
app/locale/en_US/template/email/newsletter_subscr_success.html +13 -1
app/locale/en_US/template/email/newsletter_unsub_success.html +13 -1
app/locale/en_US/template/email/password_new.html +10 -26
app/locale/en_US/template/email/payment_failed.html +48 -48
app/locale/en_US/template/email/product_alert_cron_error.html +1 -1
app/locale/en_US/template/email/product_price_alert.html +13 -2
app/locale/en_US/template/email/product_share.html +18 -1
app/locale/en_US/template/email/product_stock_alert.html +13 -2
app/locale/en_US/template/email/sales/creditmemo_new.html +75 -85
app/locale/en_US/template/email/sales/creditmemo_new_guest.html +75 -84
app/locale/en_US/template/email/sales/creditmemo_update.html +31 -36
app/locale/en_US/template/email/sales/creditmemo_update_guest.html +31 -35
app/locale/en_US/template/email/sales/invoice_new.html +76 -84
app/locale/en_US/template/email/sales/invoice_new_guest.html +79 -86
app/locale/en_US/template/email/sales/invoice_update.html +32 -36
app/locale/en_US/template/email/sales/invoice_update_guest.html +31 -34
app/locale/en_US/template/email/sales/order_new.html +75 -86
app/locale/en_US/template/email/sales/order_new_guest.html +77 -87
app/locale/en_US/template/email/sales/order_update.html +31 -36
app/locale/en_US/template/email/sales/order_update_guest.html +31 -35
app/locale/en_US/template/email/sales/shipment_new.html +78 -89
app/locale/en_US/template/email/sales/shipment_new_guest.html +78 -88
app/locale/en_US/template/email/sales/shipment_update.html +32 -36
app/locale/en_US/template/email/sales/shipment_update_guest.html +31 -35
app/locale/en_US/template/email/sitemap_generate_warning.html +1 -2
app/locale/en_US/template/email/token.html +12 -2
app/locale/en_US/template/email/wishlist_share.html +19 -23
package.xml +5 -5

app/locale/en_US/Mage_Bundle.csv CHANGED Viewed

	@@ -7,7 +7,6 @@
7	"As low as","As low as"
8	"Bundle Items","Bundle Items"
9	"Bundle Product","Bundle Product"
10	- "Bundle Product View Summary","Bundle Product View Summary"
11	"Buy %1$s","Buy %1$s"
12	"Buy %1$s for","Buy %1$s for"
13	"Buy %1$s for %2$s","Buy %1$s for %2$s"
	@@ -53,6 +52,7 @@
53	"Qty:","Qty:"
54	"Radio Buttons","Radio Buttons"
55	"Required options are not selected.","Required options are not selected."

56	"Selected required options are not available.","Selected required options are not available."
57	"Separately","Separately"
58	"Ship Bundle Items","Ship Bundle Items"


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"

52	"Qty:","Qty:"
53	"Radio Buttons","Radio Buttons"
54	"Required options are not selected.","Required options are not selected."
55	+ "SKU","SKU"
56	"Selected required options are not available.","Selected required options are not available."
57	"Separately","Separately"
58	"Ship Bundle Items","Ship Bundle Items"

app/locale/en_US/Mage_Catalog.csv CHANGED Viewed

	@@ -3,6 +3,7 @@
3	"%s - %s","%s - %s"
4	"%s Item(s)","%s Item(s)"
5	"%s and above","%s and above"

6	"(%d)","(%d)"
7	"(Copy data from: %s)","(Copy data from: %s)"
8	"* Required Fields","* Required Fields"
	@@ -57,7 +58,6 @@
57	"Allow HTML Tags on Frontend","Allow HTML Tags on Frontend"
58	"Allowed File Extensions","Allowed File Extensions"
59	"Allowed file extensions to upload","Allowed file extensions to upload"
60	- "Amount","Amount"
61	"An error occurred while adding products to websites.","An error occurred while adding products to websites."
62	"An error occurred while clearing comparison list.","An error occurred while clearing comparison list."
63	"An error occurred while deleting this review.","An error occurred while deleting this review."
	@@ -102,7 +102,6 @@
102	"Attribute add","Attribute add"
103	"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
104	"Attribute group with the \"/name/\" name already exists","Attribute group with the \"/name/\" name already exists"
105	- "Attribute group with the \/name/\ name already exists","Attribute group with the \/name/\ name already exists"
106	"Attribute remove","Attribute remove"
107	"Attribute with the same code already exists","Attribute with the same code already exists"
108	"Attributes","Attributes"
	@@ -114,6 +113,7 @@
114	"Backend Table","Backend Table"
115	"Backend Table Title","Backend Table Title"
116	"Backorders","Backorders"

117	"Based On","Based On"
118	"Before Order Confirmation","Before Order Confirmation"
119	"Best Value","Best Value"
	@@ -252,6 +252,7 @@
252	"Delete category","Delete category"
253	"Delete product","Delete product"
254	"Depends on design theme","Depends on design theme"

255	"Design","Design"
256	"Details","Details"
257	"Disabled","Disabled"
	@@ -266,7 +267,6 @@
266	"Double click on above image to view full picture","Double click on above image to view full picture"
267	"Downloadable Information","Downloadable Information"
268	"Duplicate","Duplicate"
269	- "Duplicate amount found.","Duplicate amount found."
270	"Duplicate website group price customer group.","Duplicate website group price customer group."
271	"Duplicate website tier price customer group and quantity.","Duplicate website tier price customer group and quantity."
272	"Duplicate website, country and state tax found.","Duplicate website, country and state tax found."
	@@ -296,6 +296,7 @@
296	"Field is not complete","Field is not complete"
297	"File options format is not valid.","File options format is not valid."
298	"File upload failed","File upload failed"

299	"Filter model name must be declared.","Filter model name must be declared."
300	"Filter must be an object. Please set correct filter.","Filter must be an object. Please set correct filter."
301	"Filterable (no results)","Filterable (no results)"
	@@ -404,6 +405,8 @@
404	"Maximum image width","Maximum image width"
405	"Maximum number of characters:","Maximum number of characters:"
406	"Maximum number of price intervals is 100","Maximum number of price intervals is 100"


407	"Media Image","Media Image"
408	"Minimum Advertised Price","Minimum Advertised Price"
409	"Minimum Lines per Page","Minimum Lines per Page"
	@@ -413,8 +416,8 @@
413	"More Views","More Views"
414	"Move","Move"
415	"Move category in tree","Move category in tree"
416	- "Multi update product","Multi update product"
417	"Must be in the allowed values list.","Must be in the allowed values list."

418	"N/A","N/A"
419	"Name","Name"
420	"Name in %s","Name in %s"
	@@ -467,15 +470,11 @@
467	"Please click on the Close Window button if it is not closed automatically.","Please click on the Close Window button if it is not closed automatically."
468	"Please enter a new group name","Please enter a new group name"
469	"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>"
470	- "Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>"
471	- "Please refresh ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","Please refresh ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>"
472	"Please select a static block ...","Please select a static block ..."
473	"Please select items.","Please select items."
474	"Please select one or more attributes.","Please select one or more attributes."
475	"Please select product(s).","Please select product(s)."
476	"Please select products for attributes update","Please select products for attributes update"
477	- "Please set up merge date/time","Please set up merge date/time"
478	- "Please set up merge date/time later then present date","Please set up merge date/time later then present date"
479	"Please specify date required option(s).","Please specify date required option(s)."
480	"Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals."
481	"Please specify the product required option(s)","Please specify the product required option(s)"
	@@ -508,6 +507,7 @@
508	"Product Extra Info","Product Extra Info"
509	"Product Flat Data","Product Flat Data"
510	"Product ID","Product ID"

511	"Product Image Placeholders","Product Image Placeholders"
512	"Product Image Watermarks","Product Image Watermarks"
513	"Product Images","Product Images"
	@@ -576,6 +576,7 @@
576	"Reorganize EAV product structure to flat structure","Reorganize EAV product structure to flat structure"
577	"Reset","Reset"
578	"Results","Results"

579	"Retrieve attribute data","Retrieve attribute data"
580	"Retrieve attribute list","Retrieve attribute list"
581	"Retrieve attribute options","Retrieve attribute options"
	@@ -619,7 +620,6 @@
619	"Search Information","Search Information"
620	"Search Query","Search Query"
621	"Search Term with such search query already exists.","Search Term with such search query already exists."
622	- "Search Weight","Search Weight"
623	"Searchable","Searchable"
624	"See price before order confirmation.","See price before order confirmation."
625	"Select Category...","Select Category..."
	@@ -637,6 +637,9 @@
637	"Set special price","Set special price"
638	"Set/Get current store view","Set/Get current store view"
639	"Settings","Settings"



640	"Shop By","Shop By"
641	"Shopping Options","Shopping Options"
642	"Show","Show"
	@@ -652,6 +655,7 @@
652	"Skipping import row, required field ""%s"" is not defined.","Skipping import row, required field ""%s"" is not defined."
653	"Skipping import row, store ""%s"" field does not exist.","Skipping import row, store ""%s"" field does not exist."
654	"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Skipping import row, the value ""%s"" is not valid for the ""%s"" field."

655	"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products."
656	"Some of the selected item options are not currently available.","Some of the selected item options are not currently available."
657	"Sort By","Sort By"
	@@ -735,7 +739,6 @@
735	"Top/Left","Top/Left"
736	"Top/Right","Top/Right"
737	"Total Qty Base Items","Total Qty Base Items"
738	- "Total Qty Content Items","Total Qty Content Items"
739	"Total incl. Tax: %1$s","Total incl. Tax: %1$s"
740	"Total of %d record(s) have been deleted.","Total of %d record(s) have been deleted."
741	"Total of %d record(s) have been updated.","Total of %d record(s) have been updated."
	@@ -791,6 +794,7 @@
791	"Value for ""%s"" is invalid.","Value for ""%s"" is invalid."
792	"Value for ""%s"" is invalid: %s","Value for ""%s"" is invalid: %s"
793	"Varchar","Varchar"

794	"View as","View as"
795	"Virtual Product","Virtual Product"
796	"Visibility","Visibility"
	@@ -804,8 +808,6 @@
804	"Watermark Position","Watermark Position"
805	"We Also Recommend","We Also Recommend"
806	"Website","Website"
807	- "Website Item Must be checked","Website Item Must be checked"
808	- "Website Store Must be checked","Website Store Must be checked"
809	"Websites","Websites"
810	"What's this?","What's this?"
811	"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Whether to show ""All"" option in the ""Show X Per Page"" dropdown."


3	"%s - %s","%s - %s"
4	"%s Item(s)","%s Item(s)"
5	"%s and above","%s and above"
6	+ "%s-%s of %s","%s-%s of %s"
7	"(%d)","(%d)"
8	"(Copy data from: %s)","(Copy data from: %s)"
9	"* Required Fields","* Required Fields"

58	"Allow HTML Tags on Frontend","Allow HTML Tags on Frontend"
59	"Allowed File Extensions","Allowed File Extensions"
60	"Allowed file extensions to upload","Allowed file extensions to upload"

61	"An error occurred while adding products to websites.","An error occurred while adding products to websites."
62	"An error occurred while clearing comparison list.","An error occurred while clearing comparison list."
63	"An error occurred while deleting this review.","An error occurred while deleting this review."

102	"Attribute add","Attribute add"
103	"Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter.","Attribute code is invalid. Please use only letters (a-z), numbers (0-9) or underscore(_) in this field, first character should be a letter."
104	"Attribute group with the \"/name/\" name already exists","Attribute group with the \"/name/\" name already exists"

105	"Attribute remove","Attribute remove"
106	"Attribute with the same code already exists","Attribute with the same code already exists"
107	"Attributes","Attributes"

113	"Backend Table","Backend Table"
114	"Backend Table Title","Backend Table Title"
115	"Backorders","Backorders"
116	+ "Base Image Width","Base Image Width"
117	"Based On","Based On"
118	"Before Order Confirmation","Before Order Confirmation"
119	"Best Value","Best Value"

252	"Delete category","Delete category"
253	"Delete product","Delete product"
254	"Depends on design theme","Depends on design theme"
255	+ "Description","Description"
256	"Design","Design"
257	"Details","Details"
258	"Disabled","Disabled"

267	"Double click on above image to view full picture","Double click on above image to view full picture"
268	"Downloadable Information","Downloadable Information"
269	"Duplicate","Duplicate"

270	"Duplicate website group price customer group.","Duplicate website group price customer group."
271	"Duplicate website tier price customer group and quantity.","Duplicate website tier price customer group and quantity."
272	"Duplicate website, country and state tax found.","Duplicate website, country and state tax found."

296	"Field is not complete","Field is not complete"
297	"File options format is not valid.","File options format is not valid."
298	"File upload failed","File upload failed"
299	+ "Filter","Filter"
300	"Filter model name must be declared.","Filter model name must be declared."
301	"Filter must be an object. Please set correct filter.","Filter must be an object. Please set correct filter."
302	"Filterable (no results)","Filterable (no results)"

405	"Maximum image width","Maximum image width"
406	"Maximum number of characters:","Maximum number of characters:"
407	"Maximum number of price intervals is 100","Maximum number of price intervals is 100"
408	+ "Maximum width base product image will be scaled down to in pixels","Maximum width base product image will be scaled down to in pixels"
409	+ "Maximum width small product image will be scaled down to in pixels","Maximum width small product image will be scaled down to in pixels"
410	"Media Image","Media Image"
411	"Minimum Advertised Price","Minimum Advertised Price"
412	"Minimum Lines per Page","Minimum Lines per Page"

416	"More Views","More Views"
417	"Move","Move"
418	"Move category in tree","Move category in tree"

419	"Must be in the allowed values list.","Must be in the allowed values list."
420	+ "My Account","My Account"
421	"N/A","N/A"
422	"Name","Name"
423	"Name in %s","Name in %s"

470	"Please click on the Close Window button if it is not closed automatically.","Please click on the Close Window button if it is not closed automatically."
471	"Please enter a new group name","Please enter a new group name"
472	"Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>","Please refresh ""Catalog URL Rewrites"" and ""Product Attributes"" in System -> <a href=""%s"">Index Management</a>"


473	"Please select a static block ...","Please select a static block ..."
474	"Please select items.","Please select items."
475	"Please select one or more attributes.","Please select one or more attributes."
476	"Please select product(s).","Please select product(s)."
477	"Please select products for attributes update","Please select products for attributes update"


478	"Please specify date required option(s).","Please specify date required option(s)."
479	"Please specify the number of products, that will not be divided into subintervals.","Please specify the number of products, that will not be divided into subintervals."
480	"Please specify the product required option(s)","Please specify the product required option(s)"

507	"Product Extra Info","Product Extra Info"
508	"Product Flat Data","Product Flat Data"
509	"Product ID","Product ID"
510	+ "Product Image","Product Image"
511	"Product Image Placeholders","Product Image Placeholders"
512	"Product Image Watermarks","Product Image Watermarks"
513	"Product Images","Product Images"

576	"Reorganize EAV product structure to flat structure","Reorganize EAV product structure to flat structure"
577	"Reset","Reset"
578	"Results","Results"
579	+ "Results per page","Results per page"
580	"Retrieve attribute data","Retrieve attribute data"
581	"Retrieve attribute list","Retrieve attribute list"
582	"Retrieve attribute options","Retrieve attribute options"

620	"Search Information","Search Information"
621	"Search Query","Search Query"
622	"Search Term with such search query already exists.","Search Term with such search query already exists."

623	"Searchable","Searchable"
624	"See price before order confirmation.","See price before order confirmation."
625	"Select Category...","Select Category..."

637	"Set special price","Set special price"
638	"Set/Get current store view","Set/Get current store view"
639	"Settings","Settings"
640	+ "Share Facebook","Share Facebook"
641	+ "Share on Facebook","Share on Facebook"
642	+ "Share on Twitter","Share on Twitter"
643	"Shop By","Shop By"
644	"Shopping Options","Shopping Options"
645	"Show","Show"

655	"Skipping import row, required field ""%s"" is not defined.","Skipping import row, required field ""%s"" is not defined."
656	"Skipping import row, store ""%s"" field does not exist.","Skipping import row, store ""%s"" field does not exist."
657	"Skipping import row, the value ""%s"" is not valid for the ""%s"" field.","Skipping import row, the value ""%s"" is not valid for the ""%s"" field."
658	+ "Small Image Width","Small Image Width"
659	"Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products.","Some of the processed products have no SKU value defined. Please fill it prior to performing operations on these products."
660	"Some of the selected item options are not currently available.","Some of the selected item options are not currently available."
661	"Sort By","Sort By"

739	"Top/Left","Top/Left"
740	"Top/Right","Top/Right"
741	"Total Qty Base Items","Total Qty Base Items"

742	"Total incl. Tax: %1$s","Total incl. Tax: %1$s"
743	"Total of %d record(s) have been deleted.","Total of %d record(s) have been deleted."
744	"Total of %d record(s) have been updated.","Total of %d record(s) have been updated."

794	"Value for ""%s"" is invalid.","Value for ""%s"" is invalid."
795	"Value for ""%s"" is invalid: %s","Value for ""%s"" is invalid: %s"
796	"Varchar","Varchar"
797	+ "View Details","View Details"
798	"View as","View as"
799	"Virtual Product","Virtual Product"
800	"Visibility","Visibility"

808	"Watermark Position","Watermark Position"
809	"We Also Recommend","We Also Recommend"
810	"Website","Website"


811	"Websites","Websites"
812	"What's this?","What's this?"
813	"Whether to show ""All"" option in the ""Show X Per Page"" dropdown.","Whether to show ""All"" option in the ""Show X Per Page"" dropdown."

app/locale/en_US/Mage_CatalogInventory.csv CHANGED Viewed

	@@ -28,10 +28,13 @@
28	"No Backorders","No Backorders"
29	"Not all products are available in the requested quantity","Not all products are available in the requested quantity"
30	"Notify for Quantity Below","Notify for Quantity Below"

31	"Only X left Threshold","Only X left Threshold"
32	"Out of Stock","Out of Stock"

33	"Product Stock Options","Product Stock Options"
34	"Products will still be shown by direct product URLs.","Products will still be shown by direct product URLs."

35	"Qty Increments","Qty Increments"
36	"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
37	"Retrieve stock data","Retrieve stock data"


28	"No Backorders","No Backorders"
29	"Not all products are available in the requested quantity","Not all products are available in the requested quantity"
30	"Notify for Quantity Below","Notify for Quantity Below"
31	+ "Only %s left","Only %s left"
32	"Only X left Threshold","Only X left Threshold"
33	"Out of Stock","Out of Stock"
34	+ "Product Name","Product Name"
35	"Product Stock Options","Product Stock Options"
36	"Products will still be shown by direct product URLs.","Products will still be shown by direct product URLs."
37	+ "Qty","Qty"
38	"Qty Increments","Qty Increments"
39	"Qty for Item's Status to Become Out of Stock","Qty for Item's Status to Become Out of Stock"
40	"Retrieve stock data","Retrieve stock data"

app/locale/en_US/Mage_CatalogRule.csv CHANGED Viewed

	@@ -26,7 +26,6 @@
26	"Edit Rule","Edit Rule"
27	"Edit Rule '%s'","Edit Rule '%s'"
28	"Enable Discount to Subproducts","Enable Discount to Subproducts"
29	- "Expiration Date","Expiration Date"
30	"From Date","From Date"
31	"General Information","General Information"
32	"ID","ID"
	@@ -41,19 +40,16 @@
41	"Rule Name","Rule Name"
42	"Save and Apply","Save and Apply"
43	"Save and Continue Edit","Save and Continue Edit"
44	- "Start Date","Start Date"
45	"Status","Status"
46	"Stop Further Rules Processing","Stop Further Rules Processing"
47	"The rule has been deleted.","The rule has been deleted."
48	"The rule has been saved.","The rule has been saved."
49	"The rules have been applied.","The rules have been applied."
50	- "There are rules that have been changed but were not applied. Only users with exclusive access can apply rules.","There are rules that have been changed but were not applied. Only users with exclusive access can apply rules."
51	"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog."
52	"This rule no longer exists.","This rule no longer exists."
53	"To Date","To Date"
54	"To Fixed Amount","To Fixed Amount"
55	"To Percentage of the Original Price","To Percentage of the Original Price"
56	- "Type","Type"
57	"Unable to apply rules.","Unable to apply rules."
58	"Unable to find a rule to delete.","Unable to find a rule to delete."
59	"Update Prices Using the Following Information","Update Prices Using the Following Information"


26	"Edit Rule","Edit Rule"
27	"Edit Rule '%s'","Edit Rule '%s'"
28	"Enable Discount to Subproducts","Enable Discount to Subproducts"

29	"From Date","From Date"
30	"General Information","General Information"
31	"ID","ID"

40	"Rule Name","Rule Name"
41	"Save and Apply","Save and Apply"
42	"Save and Continue Edit","Save and Continue Edit"

43	"Status","Status"
44	"Stop Further Rules Processing","Stop Further Rules Processing"
45	"The rule has been deleted.","The rule has been deleted."
46	"The rule has been saved.","The rule has been saved."
47	"The rules have been applied.","The rules have been applied."

48	"There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog.","There are rules that have been changed but were not applied. Please, click Apply Rules in order to see immediate effect in the catalog."
49	"This rule no longer exists.","This rule no longer exists."
50	"To Date","To Date"
51	"To Fixed Amount","To Fixed Amount"
52	"To Percentage of the Original Price","To Percentage of the Original Price"

53	"Unable to apply rules.","Unable to apply rules."
54	"Unable to find a rule to delete.","Unable to find a rule to delete."
55	"Update Prices Using the Following Information","Update Prices Using the Following Information"

app/locale/en_US/Mage_Checkout.csv CHANGED Viewed

	@@ -1,5 +1,7 @@
1	"%s was added to your shopping cart.","%s was added to your shopping cart."
2	"%s was updated in your shopping cart.","%s was updated in your shopping cart."


3	"* Required Fields","* Required Fields"
4	"Add New Address","Add New Address"
5	"Add New Condition","Add New Condition"
	@@ -19,7 +21,9 @@
19	"An error occurred in the process of payment","An error occurred in the process of payment"
20	"An error occurred while deleting this condition.","An error occurred while deleting this condition."
21	"An error occurred while saving this condition.","An error occurred while saving this condition."

22	"Apply Coupon","Apply Coupon"

23	"Are you sure you would like to remove this item from the shopping cart?","Are you sure you would like to remove this item from the shopping cart?"
24	"Back","Back"
25	"Back to Billing Information","Back to Billing Information"
	@@ -30,6 +34,9 @@
30	"Billing Address","Billing Address"
31	"Billing Information","Billing Information"
32	"Billing Information - %s","Billing Information - %s"



33	"Cancel Coupon","Cancel Coupon"
34	"Cannot add item to the shopping cart.","Cannot add item to the shopping cart."
35	"Cannot add the item to shopping cart","Cannot add the item to shopping cart"
	@@ -42,6 +49,7 @@
42	"Cannot update shopping cart.","Cannot update shopping cart."
43	"Cannot update the item.","Cannot update the item."
44	"Card Verification Number Visual Reference","Card Verification Number Visual Reference"

45	"Cart Product API","Cart Product API"
46	"Cart Subtotal:","Cart Subtotal:"
47	"Change","Change"
	@@ -49,6 +57,7 @@
49	"Checkbox Text","Checkbox Text"
50	"Checkout","Checkout"
51	"Checkout Conditions","Checkout Conditions"

52	"Checkout Method","Checkout Method"
53	"Checkout Options","Checkout Options"
54	"Checkout Progress Wrapper","Checkout Progress Wrapper"
	@@ -110,12 +119,15 @@
110	"Edit item","Edit item"
111	"Edit item parameters","Edit item parameters"
112	"Email Address","Email Address"


113	"Enable Onepage Checkout","Enable Onepage Checkout"
114	"Enable Terms and Conditions","Enable Terms and Conditions"
115	"Enabled","Enabled"
116	"Enter a New Address","Enter a New Address"
117	"Enter your coupon code if you have one.","Enter your coupon code if you have one."
118	"Enter your destination to get a shipping estimate.","Enter your destination to get a shipping estimate."

119	"Estimate Shipping and Tax","Estimate Shipping and Tax"
120	"Excl. Tax","Excl. Tax"
121	"Fast and easy check out","Fast and easy check out"
	@@ -140,6 +152,8 @@
140	"Invalid method: %s","Invalid method: %s"
141	"Invalid shipping method.","Invalid shipping method."
142	"Item not found or already ordered","Item not found or already ordered"


143	"Items","Items"
144	"Items After","Items After"
145	"Items Before","Items Before"
	@@ -150,9 +164,11 @@
150	"Manage Terms and Conditions","Manage Terms and Conditions"
151	"Maximum Display Recently Added Item(s)","Maximum Display Recently Added Item(s)"
152	"Maximum qty allowed for Shipping to multiple addresses is %s","Maximum qty allowed for Shipping to multiple addresses is %s"

153	"Minimum order amount is %s","Minimum order amount is %s"
154	"Move","Move"
155	"Move to Wishlist","Move to Wishlist"

156	"Multishipping Checkout","Multishipping Checkout"
157	"Multishipping Checkout Address (Any) Form","Multishipping Checkout Address (Any) Form"
158	"Multishipping Checkout Billing Address Creation","Multishipping Checkout Billing Address Creation"
	@@ -169,7 +185,6 @@
169	"My Cart","My Cart"
170	"My Cart (%s item)","My Cart (%s item)"
171	"My Cart (%s items)","My Cart (%s items)"
172	- "My Cart Extra Actions","My Cart Extra Actions"
173	"My Cart Link","My Cart Link"
174	"New Address","New Address"
175	"New Condition","New Condition"
	@@ -195,7 +210,9 @@
195	"Payment Failed Template","Payment Failed Template"
196	"Payment Information","Payment Information"
197	"Payment Method","Payment Method"

198	"Payment Methods After Checkout Button","Payment Methods After Checkout Button"

199	"Payment Methods Before Checkout Button","Payment Methods Before Checkout Button"
200	"Payment method information","Payment method information"
201	"Payment method is not defined","Payment method is not defined"
	@@ -224,6 +241,7 @@
224	"Products","Products"
225	"Qty","Qty"
226	"Qty:","Qty:"

227	"Quantity was recalculated from %d to %d","Quantity was recalculated from %d to %d"
228	"Quote Lifetime (days)","Quote Lifetime (days)"
229	"Quote item does not exist.","Quote item does not exist."
	@@ -243,6 +261,7 @@
243	"Retrieve information about shopping cart","Retrieve information about shopping cart"
244	"Review Order","Review Order"
245	"Review Order - %s","Review Order - %s"

246	"Sales","Sales"
247	"Save Condition","Save Condition"
248	"Save in address book","Save in address book"
	@@ -275,6 +294,8 @@
275	"Shipping selection is not applicable.","Shipping selection is not applicable."
276	"Shopping Cart","Shopping Cart"
277	"Shopping Cart Form Before","Shopping Cart Form Before"


278	"Shopping Cart Sidebar","Shopping Cart Sidebar"
279	"Shopping Cart Sidebar Extra Actions","Shopping Cart Sidebar Extra Actions"
280	"Shopping Cart is Empty","Shopping Cart is Empty"
	@@ -313,6 +334,7 @@
313	"Total for this address","Total for this address"
314	"Unable to set Payment Method.","Unable to set Payment Method."
315	"Unit Price","Unit Price"

316	"Update Cart","Update Cart"
317	"Update Qty & Addresses","Update Qty & Addresses"
318	"Update Shopping Cart","Update Shopping Cart"
	@@ -321,7 +343,9 @@
321	"Update product(s) quantities in shopping cart","Update product(s) quantities in shopping cart"
322	"Use Billing Address","Use Billing Address"
323	"VAT Number","VAT Number"

324	"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress."

325	"What's this?","What's this?"
326	"You have no items in your shopping cart.","You have no items in your shopping cart."
327	"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."
	@@ -333,4 +357,7 @@
333	"Your order has been received.","Your order has been received."
334	"Your order number is ","Your order number is "
335	"Your recurring payment profiles:","Your recurring payment profiles:"

336	"Zip/Postal Code","Zip/Postal Code"


1	"%s was added to your shopping cart.","%s was added to your shopping cart."
2	"%s was updated in your shopping cart.","%s was updated in your shopping cart."
3	+ "(Excl. Tax)","(Excl. Tax)"
4	+ "(Incl. Tax)","(Incl. Tax)"
5	"* Required Fields","* Required Fields"
6	"Add New Address","Add New Address"
7	"Add New Condition","Add New Condition"

21	"An error occurred in the process of payment","An error occurred in the process of payment"
22	"An error occurred while deleting this condition.","An error occurred while deleting this condition."
23	"An error occurred while saving this condition.","An error occurred while saving this condition."
24	+ "Apply","Apply"
25	"Apply Coupon","Apply Coupon"
26	+ "Are you sure you want to leave this page? You will need to go through the checkout steps again.","Are you sure you want to leave this page? You will need to go through the checkout steps again."
27	"Are you sure you would like to remove this item from the shopping cart?","Are you sure you would like to remove this item from the shopping cart?"
28	"Back","Back"
29	"Back to Billing Information","Back to Billing Information"

34	"Billing Address","Billing Address"
35	"Billing Information","Billing Information"
36	"Billing Information - %s","Billing Information - %s"
37	+ "Can not remove the item.","Can not remove the item."
38	+ "Can not save item.","Can not save item."
39	+ "Cancel","Cancel"
40	"Cancel Coupon","Cancel Coupon"
41	"Cannot add item to the shopping cart.","Cannot add item to the shopping cart."
42	"Cannot add the item to shopping cart","Cannot add the item to shopping cart"

49	"Cannot update shopping cart.","Cannot update shopping cart."
50	"Cannot update the item.","Cannot update the item."
51	"Card Verification Number Visual Reference","Card Verification Number Visual Reference"
52	+ "Cart","Cart"
53	"Cart Product API","Cart Product API"
54	"Cart Subtotal:","Cart Subtotal:"
55	"Change","Change"

57	"Checkbox Text","Checkbox Text"
58	"Checkout","Checkout"
59	"Checkout Conditions","Checkout Conditions"
60	+ "Checkout Forms Extra","Checkout Forms Extra"
61	"Checkout Method","Checkout Method"
62	"Checkout Options","Checkout Options"
63	"Checkout Progress Wrapper","Checkout Progress Wrapper"

119	"Edit item","Edit item"
120	"Edit item parameters","Edit item parameters"
121	"Email Address","Email Address"
122	+ "Empty Cart","Empty Cart"
123	+ "Empty Shopping Cart Content Before","Empty Shopping Cart Content Before"
124	"Enable Onepage Checkout","Enable Onepage Checkout"
125	"Enable Terms and Conditions","Enable Terms and Conditions"
126	"Enabled","Enabled"
127	"Enter a New Address","Enter a New Address"
128	"Enter your coupon code if you have one.","Enter your coupon code if you have one."
129	"Enter your destination to get a shipping estimate.","Enter your destination to get a shipping estimate."
130	+ "Estimate","Estimate"
131	"Estimate Shipping and Tax","Estimate Shipping and Tax"
132	"Excl. Tax","Excl. Tax"
133	"Fast and easy check out","Fast and easy check out"

152	"Invalid method: %s","Invalid method: %s"
153	"Invalid shipping method.","Invalid shipping method."
154	"Item not found or already ordered","Item not found or already ordered"
155	+ "Item was removed successfully.","Item was removed successfully."
156	+ "Item was updated successfully.","Item was updated successfully."
157	"Items","Items"
158	"Items After","Items After"
159	"Items Before","Items Before"

164	"Manage Terms and Conditions","Manage Terms and Conditions"
165	"Maximum Display Recently Added Item(s)","Maximum Display Recently Added Item(s)"
166	"Maximum qty allowed for Shipping to multiple addresses is %s","Maximum qty allowed for Shipping to multiple addresses is %s"
167	+ "Mini-cart promotion block","Mini-cart promotion block"
168	"Minimum order amount is %s","Minimum order amount is %s"
169	"Move","Move"
170	"Move to Wishlist","Move to Wishlist"
171	+ "Move to wishlist","Move to wishlist"
172	"Multishipping Checkout","Multishipping Checkout"
173	"Multishipping Checkout Address (Any) Form","Multishipping Checkout Address (Any) Form"
174	"Multishipping Checkout Billing Address Creation","Multishipping Checkout Billing Address Creation"

185	"My Cart","My Cart"
186	"My Cart (%s item)","My Cart (%s item)"
187	"My Cart (%s items)","My Cart (%s items)"

188	"My Cart Link","My Cart Link"
189	"New Address","New Address"
190	"New Condition","New Condition"

210	"Payment Failed Template","Payment Failed Template"
211	"Payment Information","Payment Information"
212	"Payment Method","Payment Method"
213	+ "Payment Methods After","Payment Methods After"
214	"Payment Methods After Checkout Button","Payment Methods After Checkout Button"
215	+ "Payment Methods Before","Payment Methods Before"
216	"Payment Methods Before Checkout Button","Payment Methods Before Checkout Button"
217	"Payment method information","Payment method information"
218	"Payment method is not defined","Payment method is not defined"

241	"Products","Products"
242	"Qty","Qty"
243	"Qty:","Qty:"
244	+ "Quantity","Quantity"
245	"Quantity was recalculated from %d to %d","Quantity was recalculated from %d to %d"
246	"Quote Lifetime (days)","Quote Lifetime (days)"
247	"Quote item does not exist.","Quote item does not exist."

261	"Retrieve information about shopping cart","Retrieve information about shopping cart"
262	"Review Order","Review Order"
263	"Review Order - %s","Review Order - %s"
264	+ "SKU","SKU"
265	"Sales","Sales"
266	"Save Condition","Save Condition"
267	"Save in address book","Save in address book"

294	"Shipping selection is not applicable.","Shipping selection is not applicable."
295	"Shopping Cart","Shopping Cart"
296	"Shopping Cart Form Before","Shopping Cart Form Before"
297	+ "Shopping Cart Items After","Shopping Cart Items After"
298	+ "Shopping Cart Items Before","Shopping Cart Items Before"
299	"Shopping Cart Sidebar","Shopping Cart Sidebar"
300	"Shopping Cart Sidebar Extra Actions","Shopping Cart Sidebar Extra Actions"
301	"Shopping Cart is Empty","Shopping Cart is Empty"

334	"Total for this address","Total for this address"
335	"Unable to set Payment Method.","Unable to set Payment Method."
336	"Unit Price","Unit Price"
337	+ "Update","Update"
338	"Update Cart","Update Cart"
339	"Update Qty & Addresses","Update Qty & Addresses"
340	"Update Shopping Cart","Update Shopping Cart"

343	"Update product(s) quantities in shopping cart","Update product(s) quantities in shopping cart"
344	"Use Billing Address","Use Billing Address"
345	"VAT Number","VAT Number"
346	+ "View Shopping Cart","View Shopping Cart"
347	"We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress.","We are processing your order and you will soon receive an email with details of the order. Once the order has shipped you will receive another email with a link to track its progress."
348	+ "What's this?","What's this?"
349	"What's this?","What's this?"
350	"You have no items in your shopping cart.","You have no items in your shopping cart."
351	"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."

357	"Your order has been received.","Your order has been received."
358	"Your order number is ","Your order number is "
359	"Your recurring payment profiles:","Your recurring payment profiles:"
360	+ "Zip","Zip"
361	"Zip/Postal Code","Zip/Postal Code"
362	+ "ok","ok"
363	+ "or","or"

app/locale/en_US/Mage_ConfigurableSwatches.csv ADDED Viewed

	@@ -0,0 +1,18 @@


1	+ "-- Please Select --","-- Please Select --"
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"
8	+ "In Stock","In Stock"
9	+ "Innermost dimensions, not including border, in pixels","Innermost dimensions, not including border, in pixels"
10	+ "Out of Stock","Out of Stock"
11	+ "Previous","Previous"
12	+ "Product Attribute to Use for Swatches in Product Listing","Product Attribute to Use for Swatches in Product Listing"
13	+ "Product Attributes to Show as Swatches in Product Detail","Product Attributes to Show as Swatches in Product Detail"
14	+ "Remove This Item","Remove This Item"
15	+ "Swatch Dimensions in Layered Navigation","Swatch Dimensions in Layered Navigation"
16	+ "Swatch Dimensions in Product Listing","Swatch Dimensions in Product Listing"
17	+ "Swatch Dimensions on Product Detail Page","Swatch Dimensions on Product Detail Page"
18	+ "Width","Width"

app/locale/en_US/Mage_Core.csv CHANGED Viewed

	@@ -18,6 +18,8 @@
18	to transfer all media to that location. Media will not be available in the new
19	location until the synchronization process is complete."
20	"Allow Countries","Allow Countries"


21	"Allow Symlinks","Allow Symlinks"
22	"Allowed IPs (comma separated)","Allowed IPs (comma separated)"
23	"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!"
	@@ -112,6 +114,10 @@
112	"Edit Store","Edit Store"
113	"Edit Store View","Edit Store View"
114	"Edit Website","Edit Website"




115	"Empty identifier field name","Empty identifier field name"
116	"Empty main table name","Empty main table name"
117	"Enable Charts","Enable Charts"
	@@ -152,7 +158,6 @@
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"
	@@ -184,6 +189,7 @@
184	"Media Storage","Media Storage"
185	"Merge CSS Files","Merge CSS Files"
186	"Merge JavaScript Files","Merge JavaScript Files"

187	"Miscellaneous HTML","Miscellaneous HTML"
188	"Miscellaneous Scripts","Miscellaneous Scripts"
189	"Model collection resource name is not defined.","Model collection resource name is not defined."
	@@ -288,6 +294,7 @@
288	"Set Return-Path","Set Return-Path"
289	"Set as Default","Set as Default"
290	"Skin (Images / CSS)","Skin (Images / CSS)"

291	"Sort Order","Sort Order"
292	"Specified date/time ""%1$s"" do not match format ""%2$s"".","Specified date/time ""%1$s"" do not match format ""%2$s""."
293	"Start date cannot be greater than end date.","Start date cannot be greater than end date."
	@@ -300,6 +307,7 @@
300	"Store Contact Information","Store Contact Information"
301	"Store Contact Telephone","Store Contact Telephone"
302	"Store Email Addresses","Store Email Addresses"

303	"Store Information","Store Information"
304	"Store Name","Store Name"
305	"Store View","Store View"


18	to transfer all media to that location. Media will not be available in the new
19	location until the synchronization process is complete."
20	"Allow Countries","Allow Countries"
21	+ "Allow Magento Backend to run in frame","Allow Magento Backend to run in frame"
22	+ "Allow Magento Frontend to run in frame","Allow Magento Frontend to run in frame"
23	"Allow Symlinks","Allow Symlinks"
24	"Allowed IPs (comma separated)","Allowed IPs (comma separated)"
25	"Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!","Allowed file types: ICO, PNG, GIF, JPG, JPEG, APNG, SVG. Not all browsers support all these formats!"

114	"Edit Store","Edit Store"
115	"Edit Store View","Edit Store View"
116	"Edit Website","Edit Website"
117	+ "Email - Footer","Email - Footer"
118	+ "Email - Header","Email - Header"
119	+ "Email Footer Template","Email Footer Template"
120	+ "Email Header Template","Email Header Template"
121	"Empty identifier field name","Empty identifier field name"
122	"Empty main table name","Empty main table name"
123	"Enable Charts","Enable Charts"

158	"Input type ""%value%"" not found in the input types list.","Input type ""%value%"" not found in the input types list."
159	"Invalid URL '%value%'.","Invalid URL '%value%'."
160	"Invalid base url type","Invalid base url type"

161	"Invalid block type: %s","Invalid block type: %s"
162	"Invalid block: %s","Invalid block: %s"
163	"Invalid connection","Invalid connection"

189	"Media Storage","Media Storage"
190	"Merge CSS Files","Merge CSS Files"
191	"Merge JavaScript Files","Merge JavaScript Files"
192	+ "Message recipients data must be set.","Message recipients data must be set."
193	"Miscellaneous HTML","Miscellaneous HTML"
194	"Miscellaneous Scripts","Miscellaneous Scripts"
195	"Model collection resource name is not defined.","Model collection resource name is not defined."

294	"Set Return-Path","Set Return-Path"
295	"Set as Default","Set as Default"
296	"Skin (Images / CSS)","Skin (Images / CSS)"
297	+ "Small Logo Image Src","Small Logo Image Src"
298	"Sort Order","Sort Order"
299	"Specified date/time ""%1$s"" do not match format ""%2$s"".","Specified date/time ""%1$s"" do not match format ""%2$s""."
300	"Start date cannot be greater than end date.","Start date cannot be greater than end date."

307	"Store Contact Information","Store Contact Information"
308	"Store Contact Telephone","Store Contact Telephone"
309	"Store Email Addresses","Store Email Addresses"
310	+ "Store Hours of Operation","Store Hours of Operation"
311	"Store Information","Store Information"
312	"Store Name","Store Name"
313	"Store View","Store View"

app/locale/en_US/Mage_Cron.csv CHANGED Viewed

	@@ -1,24 +1,16 @@
1	- "10 minutes","10 minutes"
2	- "15 minutes","15 minutes"
3	- "20 minutes","20 minutes"
4	- "30 minutes","30 minutes"
5	- "5 minutes","5 minutes"
6	"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Scheduled Tasks) - all the times are in minutes"
7	"Daily","Daily"
8	"Failure History Lifetime","Failure History Lifetime"
9	"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set."
10	"Generate Schedules Every","Generate Schedules Every"
11	"History Cleanup Every","History Cleanup Every"
12	- "Hourly","Hourly"
13	"Invalid callback: %s::%s does not exist","Invalid callback: %s::%s does not exist"
14	"Invalid model/method definition, expecting ""model/class::method"".","Invalid model/method definition, expecting ""model/class::method""."
15	- "Minute Intervals","Minute Intervals"
16	"Missed if Not Run Within","Missed if Not Run Within"
17	"Monthly","Monthly"
18	"No callbacks found","No callbacks found"
19	"Schedule Ahead for","Schedule Ahead for"
20	"Success History Lifetime","Success History Lifetime"
21	"Too late for the schedule.","Too late for the schedule."
22	- "Unable to delete the cron task.","Unable to delete the cron task."
23	"Unable to save the cron expression.","Unable to save the cron expression."
24	"Weekly","Weekly"







1	"Cron (Scheduled Tasks) - all the times are in minutes","Cron (Scheduled Tasks) - all the times are in minutes"
2	"Daily","Daily"
3	"Failure History Lifetime","Failure History Lifetime"
4	"For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set.","For correct URLs generated during cron runs please make sure that Web > Secure and Unsecure Base URLs are explicitly set."
5	"Generate Schedules Every","Generate Schedules Every"
6	"History Cleanup Every","History Cleanup Every"

7	"Invalid callback: %s::%s does not exist","Invalid callback: %s::%s does not exist"
8	"Invalid model/method definition, expecting ""model/class::method"".","Invalid model/method definition, expecting ""model/class::method""."

9	"Missed if Not Run Within","Missed if Not Run Within"
10	"Monthly","Monthly"
11	"No callbacks found","No callbacks found"
12	"Schedule Ahead for","Schedule Ahead for"
13	"Success History Lifetime","Success History Lifetime"
14	"Too late for the schedule.","Too late for the schedule."

15	"Unable to save the cron expression.","Unable to save the cron expression."
16	"Weekly","Weekly"

app/locale/en_US/Mage_Customer.csv CHANGED Viewed

	@@ -1,4 +1,3 @@
1	- " or "," or "
2	"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' appears to be a DNS hostname but cannot extract TLD part"
3	"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' appears to be a DNS hostname but cannot match TLD against known list"
4	"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'"
	@@ -79,6 +78,7 @@
79	"Create an Account","Create an Account"
80	"Create customer","Create customer"
81	"Create customer address","Create customer address"

82	"Current Password","Current Password"
83	"Customer","Customer"
84	"Customer API","Customer API"
	@@ -299,11 +299,13 @@
299	"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
300	"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
301	"Refunded","Refunded"

302	"Registered Customers","Registered Customers"
303	"Remind Email Template","Remind Email Template"
304	"Remind Password","Remind Password"
305	"Remove","Remove"
306	"Require Emails Confirmation","Require Emails Confirmation"

307	"Reset a Password","Reset a Password"
308	"Retrieve address data","Retrieve address data"
309	"Retrieve address info","Retrieve address info"
	@@ -408,7 +410,6 @@
408	"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes."
409	"Total","Total"
410	"Type","Type"
411	- "Unable to save the customer.","Unable to save the customer."
412	"Unknown","Unknown"
413	"Unsubscribe from Newsletter","Unsubscribe from Newsletter"
414	"Update","Update"
	@@ -465,4 +466,3 @@
465	"Zip/Postal Code","Zip/Postal Code"
466	"n/a","n/a"
467	"or","or"
468	- "register","register"



1	"'%value%' appears to be a DNS hostname but cannot extract TLD part","'%value%' appears to be a DNS hostname but cannot extract TLD part"
2	"'%value%' appears to be a DNS hostname but cannot match TLD against known list","'%value%' appears to be a DNS hostname but cannot match TLD against known list"
3	"'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'","'%value%' appears to be a DNS hostname but cannot match against hostname schema for TLD '%tld%'"

78	"Create an Account","Create an Account"
79	"Create customer","Create customer"
80	"Create customer address","Create customer address"
81	+ "Current Admin Password","Current Admin Password"
82	"Current Password","Current Password"
83	"Customer","Customer"
84	"Customer API","Customer API"

299	"Recovery Link Expiration Period (days)","Recovery Link Expiration Period (days)"
300	"Redirect Customer to Account Dashboard after Logging in","Redirect Customer to Account Dashboard after Logging in"
301	"Refunded","Refunded"
302	+ "Register","Register"
303	"Registered Customers","Registered Customers"
304	"Remind Email Template","Remind Email Template"
305	"Remind Password","Remind Password"
306	"Remove","Remove"
307	"Require Emails Confirmation","Require Emails Confirmation"
308	+ "Require admin user to change user password","Require admin user to change user password"
309	"Reset a Password","Reset a Password"
310	"Retrieve address data","Retrieve address data"
311	"Retrieve address info","Retrieve address info"

410	"To show VAT number on frontend, set Show VAT Number on Frontend option to Yes.","To show VAT number on frontend, set Show VAT Number on Frontend option to Yes."
411	"Total","Total"
412	"Type","Type"

413	"Unknown","Unknown"
414	"Unsubscribe from Newsletter","Unsubscribe from Newsletter"
415	"Update","Update"

466	"Zip/Postal Code","Zip/Postal Code"
467	"n/a","n/a"
468	"or","or"

app/locale/en_US/Mage_Directory.csv CHANGED Viewed

	@@ -39,9 +39,10 @@
39	"State is required for","State is required for"
40	"State/Province","State/Province"
41	"States Options","States Options"
42	- "Strikeiron Email Update Warnings","Strikeiron Email Update Warnings"
43	"Unable to initialize the import model.","Unable to initialize the import model."
44	"Undefined rate from ""%s-%s"".","Undefined rate from ""%s-%s""."
45	"WARNING:","WARNING:"
46	"Webservicex","Webservicex"


47	"Your current currency is: %s","Your current currency is: %s"


39	"State is required for","State is required for"
40	"State/Province","State/Province"
41	"States Options","States Options"

42	"Unable to initialize the import model.","Unable to initialize the import model."
43	"Undefined rate from ""%s-%s"".","Undefined rate from ""%s-%s""."
44	"WARNING:","WARNING:"
45	"Webservicex","Webservicex"
46	+ "Your Currency","Your Currency"
47	+ "Your Currency:","Your Currency:"
48	"Your current currency is: %s","Your current currency is: %s"

app/locale/en_US/Mage_Downloadable.csv CHANGED Viewed

	@@ -41,6 +41,7 @@
41	"Max. Downloads","Max. Downloads"
42	"Message:","Message:"
43	"Move","Move"

44	"My Downloadable Products","My Downloadable Products"
45	"Open Links in New Window","Open Links in New Window"
46	"Order #","Order #"
	@@ -64,6 +65,7 @@
64	"Remove links and samples from downloadable product","Remove links and samples from downloadable product"
65	"Requested link does not exist.","Requested link does not exist."
66	"Retrieve links and samples list from downloadable product","Retrieve links and samples list from downloadable product"

67	"Sample","Sample"
68	"See price before order confirmation.","See price before order confirmation."
69	"Shareable","Shareable"
	@@ -72,6 +74,7 @@
72	"Sort Order","Sort Order"
73	"Start Download","Start Download"
74	"Status","Status"

75	"The file does not exist.","The file does not exist."
76	"The link has expired.","The link has expired."
77	"The link is not available.","The link is not available."
	@@ -80,6 +83,7 @@
80	"To:","To:"
81	"U","U"
82	"Unlimited","Unlimited"

83	"Use Content-Disposition","Use Content-Disposition"
84	"Use Default Value","Use Default Value"
85	"View Order","View Order"


41	"Max. Downloads","Max. Downloads"
42	"Message:","Message:"
43	"Move","Move"
44	+ "Move to wishlist","Move to wishlist"
45	"My Downloadable Products","My Downloadable Products"
46	"Open Links in New Window","Open Links in New Window"
47	"Order #","Order #"

65	"Remove links and samples from downloadable product","Remove links and samples from downloadable product"
66	"Requested link does not exist.","Requested link does not exist."
67	"Retrieve links and samples list from downloadable product","Retrieve links and samples list from downloadable product"
68	+ "SKU","SKU"
69	"Sample","Sample"
70	"See price before order confirmation.","See price before order confirmation."
71	"Shareable","Shareable"

74	"Sort Order","Sort Order"
75	"Start Download","Start Download"
76	"Status","Status"
77	+ "Subtotal","Subtotal"
78	"The file does not exist.","The file does not exist."
79	"The link has expired.","The link has expired."
80	"The link is not available.","The link is not available."

83	"To:","To:"
84	"U","U"
85	"Unlimited","Unlimited"
86	+ "Update","Update"
87	"Use Content-Disposition","Use Content-Disposition"
88	"Use Default Value","Use Default Value"
89	"View Order","View Order"

app/locale/en_US/Mage_GoogleAnalytics.csv CHANGED Viewed

	@@ -3,3 +3,5 @@
3	"Enable IP anonymization","Enable IP anonymization"
4	"Google API","Google API"
5	"Google Analytics","Google Analytics"


3	"Enable IP anonymization","Enable IP anonymization"
4	"Google API","Google API"
5	"Google Analytics","Google Analytics"
6	+ "Type","Type"
7	+ "Universal Analytics","Universal Analytics"

app/locale/en_US/Mage_Oauth.csv CHANGED Viewed

	@@ -39,6 +39,7 @@
39	"Consumer Name","Consumer Name"
40	"Consumers","Consumers"
41	"Created At","Created At"

42	"Customer","Customer"
43	"Customer My Account My OAuth Applications","Customer My Account My OAuth Applications"
44	"Delete","Delete"


39	"Consumer Name","Consumer Name"
40	"Consumers","Consumers"
41	"Created At","Created At"
42	+ "Current Admin Password","Current Admin Password"
43	"Customer","Customer"
44	"Customer My Account My OAuth Applications","Customer My Account My OAuth Applications"
45	"Delete","Delete"

app/locale/en_US/Mage_Page.csv CHANGED Viewed

	@@ -1,6 +1,6 @@
1	"%s Item(s)","%s Item(s)"
2	- "~~©~~ ~~2012~~ ~~Magento Demo Store. All Rights Reserved.~~","~~©~~ ~~2012~~ ~~Magento Demo Store. All Rights Reserved.~~"
3	- "© ~~2013~~ Magento Demo Store. All Rights Reserved.","© ~~2013~~ Magento Demo Store. All Rights Reserved."
4	"(Shift-)Click or drag to change value","(Shift-)Click or drag to change value"
5	"(ver. %s)","(ver. %s)"
6	"- Click on any of the time parts to increase it","- Click on any of the time parts to increase it"
	@@ -15,6 +15,7 @@
15	"2 columns with right bar","2 columns with right bar"
16	"3 columns","3 columns"
17	"About the calendar","About the calendar"

18	"All Empty Layout Pages","All Empty Layout Pages"
19	"All One-Column Layout Pages","All One-Column Layout Pages"
20	"All Pages","All Pages"
	@@ -43,7 +44,9 @@
43	"Items %s to %s of %s total","Items %s to %s of %s total"
44	"JavaScript seems to be disabled in your browser.","JavaScript seems to be disabled in your browser."
45	"Left Column","Left Column"

46	"Main Content Area","Main Content Area"

47	"Navigation Bar","Navigation Bar"
48	"Next","Next"
49	"Next month (hold for menu)","Next month (hold for menu)"
	@@ -58,15 +61,17 @@
58	"Previous","Previous"
59	"Redirecting...","Redirecting..."
60	"Report All Bugs","Report All Bugs"

61	"Right Column","Right Column"

62	"Select Store","Select Store"
63	"Select Store:","Select Store:"
64	"Select date","Select date"
65	"Show","Show"
66	"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."
67	- "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."
68	"Time selection:","Time selection:"
69	"Time:","Time:"

70	"Welcome, %s!","Welcome, %s!"
71	"You must have JavaScript enabled in your browser to utilize the functionality of this website.","You must have JavaScript enabled in your browser to utilize the functionality of this website."
72	"Your Language","Your Language"


1	"%s Item(s)","%s Item(s)"
2	+ "%s-%s of %s","%s-%s of %s"
3	+ "© 2014 Magento Demo Store. All Rights Reserved.","© 2014 Magento Demo Store. All Rights Reserved."
4	"(Shift-)Click or drag to change value","(Shift-)Click or drag to change value"
5	"(ver. %s)","(ver. %s)"
6	"- Click on any of the time parts to increase it","- Click on any of the time parts to increase it"

15	"2 columns with right bar","2 columns with right bar"
16	"3 columns","3 columns"
17	"About the calendar","About the calendar"
18	+ "Account","Account"
19	"All Empty Layout Pages","All Empty Layout Pages"
20	"All One-Column Layout Pages","All One-Column Layout Pages"
21	"All Pages","All Pages"

44	"Items %s to %s of %s total","Items %s to %s of %s total"
45	"JavaScript seems to be disabled in your browser.","JavaScript seems to be disabled in your browser."
46	"Left Column","Left Column"
47	+ "Left Column First (shows above main column on smaller screens)","Left Column First (shows above main column on smaller screens)"
48	"Main Content Area","Main Content Area"
49	+ "Menu","Menu"
50	"Navigation Bar","Navigation Bar"
51	"Next","Next"
52	"Next month (hold for menu)","Next month (hold for menu)"

61	"Previous","Previous"
62	"Redirecting...","Redirecting..."
63	"Report All Bugs","Report All Bugs"
64	+ "Results per page","Results per page"
65	"Right Column","Right Column"
66	+ "Search","Search"
67	"Select Store","Select Store"
68	"Select Store:","Select Store:"
69	"Select date","Select date"
70	"Show","Show"
71	"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."

72	"Time selection:","Time selection:"
73	"Time:","Time:"
74	+ "View All","View All"
75	"Welcome, %s!","Welcome, %s!"
76	"You must have JavaScript enabled in your browser to utilize the functionality of this website.","You must have JavaScript enabled in your browser to utilize the functionality of this website."
77	"Your Language","Your Language"

app/locale/en_US/Mage_PageCache.csv CHANGED Viewed

	@@ -3,7 +3,6 @@
3	"Enable External Cache","Enable External Cache"
4	"External Cache Control","External Cache Control"
5	"External Full Page Cache Settings","External Full Page Cache Settings"
6	- "External Page Cache","External Page Cache"
7	"External full page cache.","External full page cache."
8	"Failed to load external cache control","Failed to load external cache control"
9	"Flush External Page Cache","Flush External Page Cache"


3	"Enable External Cache","Enable External Cache"
4	"External Cache Control","External Cache Control"
5	"External Full Page Cache Settings","External Full Page Cache Settings"

6	"External full page cache.","External full page cache."
7	"Failed to load external cache control","Failed to load external cache control"
8	"Flush External Page Cache","Flush External Page Cache"

app/locale/en_US/Mage_Paygate.csv CHANGED Viewed

	@@ -25,7 +25,6 @@
25	"Invalid amount for partial authorization.","Invalid amount for partial authorization."
26	"Invalid amount for refund.","Invalid amount for refund."
27	"Invalid split tenderId ID.","Invalid split tenderId ID."
28	- "Invalid transaction ID.","Invalid transaction ID."
29	"Maximum Order Total","Maximum Order Total"
30	"Merchant's Email","Merchant's Email"
31	"Minimum Order Total","Minimum Order Total"


25	"Invalid amount for partial authorization.","Invalid amount for partial authorization."
26	"Invalid amount for refund.","Invalid amount for refund."
27	"Invalid split tenderId ID.","Invalid split tenderId ID."

28	"Maximum Order Total","Maximum Order Total"
29	"Merchant's Email","Merchant's Email"
30	"Minimum Order Total","Minimum Order Total"

app/locale/en_US/Mage_Payment.csv CHANGED Viewed

	@@ -1,4 +1,5 @@
1	"%s %s cycle.","%s %s cycle."

2	"--Please Select--","--Please Select--"
3	"3D Secure Card Validation","3D Secure Card Validation"
4	"3D Secure Credit Card Validation","3D Secure Credit Card Validation"
	@@ -27,9 +28,7 @@
27	"Centinel API URL","Centinel API URL"
28	"Check / Money Order","Check / Money Order"
29	"Credit Card Number","Credit Card Number"
30	- "Credit Card Number: xxxx-%s","Credit Card Number: xxxx-%s"
31	"Credit Card Type","Credit Card Type"
32	- "Credit Card Type: %s","Credit Card Type: %s"
33	"Credit Card Types","Credit Card Types"
34	"Credit card number mismatch with credit card type.","Credit card number mismatch with credit card type."
35	"Credit card type is not allowed for this payment method.","Credit card type is not allowed for this payment method."
	@@ -40,7 +39,6 @@
40	"Debug Mode","Debug Mode"
41	"Enabled","Enabled"
42	"Expiration Date","Expiration Date"
43	- "Expiration Date: %s/%s","Expiration Date: %s/%s"
44	"Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment."
45	"Incorrect credit card expiration date.","Incorrect credit card expiration date."
46	"Initial Fee","Initial Fee"
	@@ -62,13 +60,11 @@
62	"N/A","N/A"
63	"Name on Card","Name on Card"
64	"Name on the Card","Name on the Card"
65	- "Name on the Card: %s","Name on the Card: %s"
66	"New Order Status","New Order Status"
67	"Number of billing periods that make up one billing cycle.","Number of billing periods that make up one billing cycle."
68	"Order action is not available.","Order action is not available."
69	"Overrides API URL that may be specified by a payment method.","Overrides API URL that may be specified by a payment method."
70	"Password","Password"
71	- "Payment ID: %s","Payment ID: %s"
72	"Payment Method","Payment Method"
73	"Payment Methods","Payment Methods"
74	"Payment Methods Section","Payment Methods Section"


1	"%s %s cycle.","%s %s cycle."
2	+ "* Required Fields","* Required Fields"
3	"--Please Select--","--Please Select--"
4	"3D Secure Card Validation","3D Secure Card Validation"
5	"3D Secure Credit Card Validation","3D Secure Credit Card Validation"

28	"Centinel API URL","Centinel API URL"
29	"Check / Money Order","Check / Money Order"
30	"Credit Card Number","Credit Card Number"

31	"Credit Card Type","Credit Card Type"

32	"Credit Card Types","Credit Card Types"
33	"Credit card number mismatch with credit card type.","Credit card number mismatch with credit card type."
34	"Credit card type is not allowed for this payment method.","Credit card type is not allowed for this payment method."

39	"Debug Mode","Debug Mode"
40	"Enabled","Enabled"
41	"Expiration Date","Expiration Date"

42	"Full name of the person receiving the product or service paid for by the recurring payment.","Full name of the person receiving the product or service paid for by the recurring payment."
43	"Incorrect credit card expiration date.","Incorrect credit card expiration date."
44	"Initial Fee","Initial Fee"

60	"N/A","N/A"
61	"Name on Card","Name on Card"
62	"Name on the Card","Name on the Card"

63	"New Order Status","New Order Status"
64	"Number of billing periods that make up one billing cycle.","Number of billing periods that make up one billing cycle."
65	"Order action is not available.","Order action is not available."
66	"Overrides API URL that may be specified by a payment method.","Overrides API URL that may be specified by a payment method."
67	"Password","Password"

68	"Payment Method","Payment Method"
69	"Payment Methods","Payment Methods"
70	"Payment Methods Section","Payment Methods Section"

app/locale/en_US/Mage_Paypal.csv CHANGED Viewed

	@@ -1,8 +1,79 @@




























































1	"-OR-","-OR-"




2	"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."




3	"3D Secure","3D Secure"
4	"3D Secure Card Validation","3D Secure Card Validation"
5	"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."



6	"<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>","<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>"
7	"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
8	"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."
	@@ -39,6 +110,7 @@
39	"Address","Address"
40	"Address Verification System Response","Address Verification System Response"
41	"Advanced Settings","Advanced Settings"

42	"All the address information matched","All the address information matched"
43	"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
44	"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile)."
	@@ -52,9 +124,7 @@
52	"Authenticated, Good Result","Authenticated, Good Result"
53	"Authorization","Authorization"
54	"Authorization Honor Period (days)","Authorization Honor Period (days)"
55	- "Authorization expired.","Authorization expired."
56	"Authorization transaction is required to void.","Authorization transaction is required to void."
57	- "Authorization was voided by merchant.","Authorization was voided by merchant."
58	"Authorized amount of %s.","Authorized amount of %s."
59	"Authorizing amount of %s is pending approval on gateway.","Authorizing amount of %s is pending approval on gateway."
60	"Auto","Auto"
	@@ -76,8 +146,8 @@
76	"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
77	"Basic Settings - PayPal Website Payments Pro Payflow Edition","Basic Settings - PayPal Website Payments Pro Payflow Edition"
78	"Basic Settings - PayPal Website Payments Standard","Basic Settings - PayPal Website Payments Standard"
79	- "Billing Address","Billing Address"
80	"Billing Agreement Signup","Billing Agreement Signup"

81	"Bonus for first ACH Use","Bonus for first ACH Use"
82	"Both section above must be complete. ","Both section above must be complete. "
83	"Buyer Credit Payment","Buyer Credit Payment"
	@@ -95,11 +165,15 @@
95	"CVV2 Check Result by PayPal","CVV2 Check Result by PayPal"
96	"Can not send new order email.","Can not send new order email."
97	"Cannot create target file for reading reports.","Cannot create target file for reading reports."


98	"Centinel API URL","Centinel API URL"
99	"Centinel Custom API URL","Centinel Custom API URL"
100	"Charge-off","Charge-off"
101	"Chargeback","Chargeback"

102	"Checkout with PayPal","Checkout with PayPal"

103	"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
104	"City","City"
105	"Click here if you are not redirected within 10 seconds...","Click here if you are not redirected within 10 seconds..."
	@@ -121,10 +195,7 @@
121	"Custom","Custom"
122	"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
123	"Custom Path","Custom Path"
124	- "Customer Information","Customer Information"
125	"Customer did not include a confirmed address.","Customer did not include a confirmed address."
126	- "Customer failed to pay.","Customer failed to pay."
127	- "Customer used non-confirmed address.","Customer used non-confirmed address."
128	"Daily","Daily"
129	"Debit","Debit"
130	"Debit Card Cash Back","Debit Card Cash Back"
	@@ -133,12 +204,17 @@
133	"Debug Mode","Debug Mode"
134	"Direct Payment API","Direct Payment API"
135	"Discount","Discount"

136	"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"


137	"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
138	"Dispute","Dispute"
139	"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
140	"Dynamic","Dynamic"
141	"EFT Funding (German banking)","EFT Funding (German banking)"


142	"Edit Shopping Cart","Edit Shopping Cart"
143	"Email Address","Email Address"
144	"Email Associated with PayPal Merchant Account","Email Associated with PayPal Merchant Account"
	@@ -147,6 +223,7 @@
147	"Enable Express Checkout","Enable Express Checkout"
148	"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
149	"Enable Payflow Link","Enable Payflow Link"

150	"Enable SSL verification","Enable SSL verification"
151	"Enable this Solution","Enable this Solution"
152	"Enabled","Enabled"
	@@ -161,7 +238,6 @@
161	"Exact Match. Address and Postal Code. International","Exact Match. Address and Postal Code. International"
162	"Exact Match. Address and Postal Code. UK-specific","Exact Match. Address and Postal Code. UK-specific"
163	"Exact Match. Address and nine-digit ZIP code","Exact Match. Address and nine-digit ZIP code"
164	- "Explanation: %s.","Explanation: %s."
165	"Express Checkout","Express Checkout"
166	"Express Checkout APIs","Express Checkout APIs"
167	"Express Checkout and Order have been canceled.","Express Checkout and Order have been canceled."
	@@ -202,20 +278,24 @@
202	"General: reversal of a type not belonging to the other T11xx categories","General: reversal of a type not belonging to the other T11xx categories"
203	"General: temporary hold of a type not belonging to the other T15xx categories","General: temporary hold of a type not belonging to the other T15xx categories"
204	"Get Credentials from PayPal","Get Credentials from PayPal"

205	"Gift Certificate Payment: purchase of Gift Certificate","Gift Certificate Payment: purchase of Gift Certificate"
206	"Gift Certificate Redemption","Gift Certificate Redemption"
207	"Gross Amount","Gross Amount"

208	"Header Background Color","Header Background Color"
209	"Header Border Color","Header Border Color"
210	"Header Image URL","Header Image URL"
211	"Help","Help"
212	"Hidden Virtual PayPal Debit Card Transaction","Hidden Virtual PayPal Debit Card Transaction"
213	"Hold for Dispute Investigation","Hold for Dispute Investigation"



214	"IPN ""%s"".","IPN ""%s""."
215	"IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""","IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s"""
216	"IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s.","IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s."
217	"IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s","IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s"
218	- "IPN verification ""%s"".","IPN verification ""%s""."
219	"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
220	"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
221	"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."
	@@ -247,15 +327,11 @@
247	"Merchant Location","Merchant Location"
248	"Merchant Protection Eligibility","Merchant Protection Eligibility"
249	"Merchant Referral Bonus","Merchant Referral Bonus"
250	- "Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview.","Merchant account doesn\'t have a withdrawal mechanism. Merchant must manually accept or deny this payment from your Account Overview."
251	- "Merchant account is not verified.","Merchant account is not verified."
252	- "Merchant denied this pending payment.","Merchant denied this pending payment."
253	"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Merchant holds a non-U.S. account and does not have a withdrawal mechanism."
254	- "Merchant must upgrade account to Business or Premier status.","Merchant must upgrade account to Business or Premier status."
255	"Merchant reference ID format is not supported.","Merchant reference ID format is not supported."
256	"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account."

257	"Mobile Payment (made via a mobile phone)","Mobile Payment (made via a mobile phone)"
258	- "Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview.","Multi-currency issue. Merchant must manually accept or deny this payment from PayPal Account Overview."
259	"N/A","N/A"
260	"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Address not checked, or acquirer had no response. Service not available"
261	"N/A. Global Unavailable","N/A. Global Unavailable"
	@@ -271,6 +347,7 @@
271	"N/A. The merchant did not provide AVS information","N/A. The merchant did not provide AVS information"
272	"N/A. The merchant has not implemented CVV2 code handling","N/A. The merchant has not implemented CVV2 code handling"
273	"N/A. Unavailable","N/A. Unavailable"

274	"Negative Balance","Negative Balance"
275	"Never","Never"
276	"No","No"
	@@ -311,6 +388,13 @@
311	"PayPal Express Checkout Shortcut Wrapper","PayPal Express Checkout Shortcut Wrapper"
312	"PayPal Express Checkout Token does not exist.","PayPal Express Checkout Token does not exist."
313	"PayPal Express Checkout is not enabled.","PayPal Express Checkout is not enabled."







314	"PayPal Express Order Review Form","PayPal Express Order Review Form"
315	"PayPal Fee Information","PayPal Fee Information"
316	"PayPal Merchant Pages Style","PayPal Merchant Pages Style"
	@@ -322,6 +406,7 @@
322	"PayPal Reference ID","PayPal Reference ID"
323	"PayPal Reference ID Type","PayPal Reference ID Type"
324	"PayPal Settlement Reports","PayPal Settlement Reports"

325	"PayPal certificate does not exist.","PayPal certificate does not exist."
326	"PayPal certificate file is empty.","PayPal certificate file is empty."
327	"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process."
	@@ -345,50 +430,53 @@
345	"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
346	"Payment Action","Payment Action"
347	"Payment Applicable From","Payment Applicable From"

348	"Payment Refund initiated by merchant","Payment Refund initiated by merchant"
349	"Payment has been declined. Please try again.","Payment has been declined. Please try again."
350	- "Payment is being reviewed by PayPal for risk.","Payment is being reviewed by PayPal for risk."
351	"Payment transactions disallow storing objects.","Payment transactions disallow storing objects."
352	- "Payment was made to an email address that is not yet registered or confirmed.","Payment was made to an email address that is not yet registered or confirmed."
353	"Payments Advanced","Payments Advanced"
354	"Payments Advanced (Includes Express Checkout)","Payments Advanced (Includes Express Checkout)"
355	"Payments Pro (Includes Express Checkout)","Payments Pro (Includes Express Checkout)"
356	"Payments Pro Hosted Solution","Payments Pro Hosted Solution"
357	"Payments Pro and Express Checkout","Payments Pro and Express Checkout"
358	"Payments Standard","Payments Standard"

359	"Payments by PayPal (150 X 40)","Payments by PayPal (150 X 40)"
360	"Payments by PayPal (150 X 60)","Payments by PayPal (150 X 60)"
361	"Pending PayPal","Pending PayPal"
362	"Place Order","Place Order"
363	"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order."
364	- "Please contact PayPal Customer Service.","Please contact PayPal Customer Service."
365	"Please do not refresh the page until you complete payment.","Please do not refresh the page until you complete payment."
366	"Please re-enable the previously enabled payment solutions.","Please re-enable the previously enabled payment solutions."
367	"Please select a shipping method...","Please select a shipping method..."
368	"Please select region, state or province","Please select region, state or province"
369	"Please update order data to get shipping methods and rates","Please update order data to get shipping methods and rates"
370	"Points Incentive Redemption","Points Incentive Redemption"

371	"Postage Payment to either USPS or UPS","Postage Payment to either USPS or UPS"
372	"Preapproved Payment (BillUser API), either sent or received","Preapproved Payment (BillUser API), either sent or received"
373	"Preapproved Payment ID","Preapproved Payment ID"
374	"Price","Price"
375	"Pro","Pro"
376	"Process payments using your own internet merchant account.","Process payments using your own internet merchant account."

377	"Product Name","Product Name"
378	"Proxy Host","Proxy Host"
379	"Proxy Port","Proxy Port"

380	"Qty","Qty"
381	"Reauthorization","Reauthorization"
382	"Reference Information","Reference Information"

383	"Reimbursement for a chargeback.","Reimbursement for a chargeback."
384	"Reimbursement of Chargeback","Reimbursement of Chargeback"
385	"Report Date","Report Date"
386	"Reports","Reports"
387	- "Requested %s and configured %s merchant emails do not match.","Requested %s and configured %s merchant emails do not match."
388	"Require CVV Entry","Require CVV Entry"
389	"Require Customer's Billing Address","Require Customer's Billing Address"
390	"Required PayPal Settings","Required PayPal Settings"
391	"Required Settings","Required Settings"

392	"Reversal","Reversal"
393	"Reversal of General Account Hold","Reversal of General Account Hold"
394	"Reversal of Points Usage","Reversal of Points Usage"
	@@ -416,14 +504,16 @@
416	"Severe validation removes chargeback liability on merchant.","Severe validation removes chargeback liability on merchant."
417	"Shipping","Shipping"
418	"Shipping Address","Shipping Address"

419	"Shipping Method","Shipping Method"
420	"Shop now using (150 X 40)","Shop now using (150 X 40)"
421	"Shop now using (150 X 60)","Shop now using (150 X 60)"
422	"Shortcut","Shortcut"
423	"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
424	- "~~Shortcut~~ ~~on Product View~~","~~Shortcut~~ ~~on Product View~~"
425	- "Shortcut on Shopping Cart","Shortcut on Shopping Cart"
426	"Sign a billing agreement to streamline further purchases with PayPal.","Sign a billing agreement to streamline further purchases with PayPal."


427	"Solo","Solo"
428	"Some PayPal solutions conflict.","Some PayPal solutions conflict."
429	"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."
	@@ -463,8 +553,10 @@
463	"This operation requires an existing transaction object.","This operation requires an existing transaction object."
464	"Time of Day","Time of Day"
465	"Title","Title"

466	"Transaction ID","Transaction ID"
467	"Transaction ID must not be empty.","Transaction ID must not be empty."

468	"Transaction Information","Transaction Information"
469	"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
470	"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."
	@@ -480,11 +572,10 @@
480	"Unable to place the order.","Unable to place the order."
481	"Unable to process Express Checkout approval.","Unable to process Express Checkout approval."
482	"Unable to start Express Checkout.","Unable to start Express Checkout."
483	- "Unable to update Order data.","Unable to update Order data."
484	"Unable to update shipping method.","Unable to update shipping method."
485	"Unknown Error. Please try again later.","Unknown Error. Please try again later."
486	"Unknown reason. Please contact PayPal customer service.","Unknown reason. Please contact PayPal customer service."
487	- "Update ~~Order~~ ~~Data~~","Update ~~Order~~ ~~Data~~"
488	"Use Proxy","Use Proxy"
489	"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
490	"User","User"
	@@ -499,7 +590,6 @@
499	"Virtual PayPal Debit Card Transaction","Virtual PayPal Debit Card Transaction"
500	"Virtual Terminal Payment","Virtual Terminal Payment"
501	"Void","Void"
502	- "Waiting until Customer\'s eCheck will be cleared.","Waiting until Customer\'s eCheck will be cleared."
503	"We prefer PayPal (150 X 40)","We prefer PayPal (150 X 40)"
504	"We prefer PayPal (150 X 60)","We prefer PayPal (150 X 60)"
505	"Website Payments Plus","Website Payments Plus"
	@@ -511,15 +601,16 @@
511	"Website Payments Pro Payflow Edition and Express Checkout","Website Payments Pro Payflow Edition and Express Checkout"
512	"Website Payments Pro and Express Checkout","Website Payments Pro and Express Checkout"
513	"Website Payments Standard","Website Payments Standard"

514	"Website Payments Standard Payment","Website Payments Standard Payment"
515	"What is PayPal?","What is PayPal?"
516	"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
517	"Will appear as a payment option only for customers who have at least one active billing agreement.","Will appear as a payment option only for customers who have at least one active billing agreement."
518	"WorldLink Withdrawal","WorldLink Withdrawal"
519	"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Would you like to sign a billing agreement to streamline further purchases with PayPal?"
520	- "Wrong Order ID (%s) specified.","Wrong Order ID (%s) specified."
521	"Wrong PayPal Express Checkout Token specified.","Wrong PayPal Express Checkout Token specified."
522	"Yes","Yes"

523	"Yes. Matched Address and five-didgit ZIP","Yes. Matched Address and five-didgit ZIP"
524	"You cannot void a verification transaction","You cannot void a verification transaction"
525	"You will be redirected to the PayPal website in a few seconds.","You will be redirected to the PayPal website in a few seconds."
	@@ -527,13 +618,4 @@
527	"You will be redirected to the PayPal website.","You will be redirected to the PayPal website."
528	"You will be required to enter your payment details after you place an order.","You will be required to enter your payment details after you place an order."
529	"Zip/Postal Code","Zip/Postal Code"
530	- "chargeback reimbursed","chargeback reimbursed"
531	- "chargeback settled","chargeback settled"
532	- "customer complaint","customer complaint"
533	- "customer triggered a chargeback","customer triggered a chargeback"
534	- "customer triggered money-back guarantee","customer triggered money-back guarantee"
535	"eBay Auction Payment","eBay Auction Payment"
536	- "merchant refunded payment","merchant refunded payment"
537	- "no reason","no reason"
538	- "reversal of an adjustment","reversal of an adjustment"
539	- "unknown reason","unknown reason"


1	+ "
2	+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
3	+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
4	+ from Paypal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
5	+ Use PayPal’s free banner ads that let you advertise Paypal Credit® financing as a payment option when your customers check out with PayPal.
6	+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
7	+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
8	+ ","
9	+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
10	+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
11	+ from Paypal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
12	+ Use PayPal’s free banner ads that let you advertise Paypal Credit® financing as a payment option when your customers check out with PayPal.
13	+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
14	+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
15	+ "
16	+ "
17	+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
18	+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
19	+ from Paypal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
20	+ Use PayPal’s free banner ads that let you advertise Paypal Credit® financing as a payment option when your customers check out with PayPal.
21	+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
22	+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
23	+ ","
24	+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
25	+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
26	+ from Paypal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
27	+ Use PayPal’s free banner ads that let you advertise Paypal Credit® financing as a payment option when your customers check out with PayPal.
28	+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
29	+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
30	+ "
31	+ "
32	+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
33	+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
34	+ from Paypal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
35	+ Use PayPal’s free banner ads that let you advertise Paypal Credit® financing as a payment option when your customers check out with PayPal.
36	+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
37	+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
38	+ ","
39	+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
40	+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
41	+ from Paypal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
42	+ Use PayPal’s free banner ads that let you advertise Paypal Credit® financing as a payment option when your customers check out with PayPal.
43	+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
44	+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
45	+ "
46	+ "
47	+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
48	+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
49	+ from Paypal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
50	+ Use PayPal’s free banner ads that let you advertise Paypal Credit® financing as a payment option when your customers check out with PayPal.
51	+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
52	+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
53	+ ","
54	+ <a href=""https://financing.paypal.com/ppfinportal/content/whyUseFinancing"" target=""_blank"">Why Advertise Financing?</a><br/>
55	+ <strong>Give your sales a boost when you advertise financing.</strong><br/>PayPal helps turn browsers into buyers with financing
56	+ from Paypal Credit®. Your customers have more time to pay, while you get paid up front – at no additional cost to you.
57	+ Use PayPal’s free banner ads that let you advertise Paypal Credit® financing as a payment option when your customers check out with PayPal.
58	+ The PayPal Advertising Program has been shown to generate additional purchases as well as increase consumer's average purchase sizes by 15%
59	+ or more. <a href=""https://financing.paypal.com/ppfinportal/content/forrester"" target=""_blank"">See Details</a>.
60	+ "
61	"-OR-","-OR-"
62	+ "120 x 240","120 x 240"
63	+ "120 x 600","120 x 600"
64	+ "120 x 90","120 x 90"
65	+ "190 x 100","190 x 100"
66	"2-pixel perimeter around the header space.","2-pixel perimeter around the header space."
67	+ "234 x 400","234 x 400"
68	+ "234 x 60","234 x 60"
69	+ "250 x 250","250 x 250"
70	+ "300 x 50","300 x 50"
71	"3D Secure","3D Secure"
72	"3D Secure Card Validation","3D Secure Card Validation"
73	"3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>.","3D Secure validation is required for Maestro cards. Supporting of American Express cards require additional agreement. Learn more at <a href=""http://www.paypal.com/amexupdate"">http://www.paypal.com/amexupdate</a>."
74	+ "468 x 60","468 x 60"
75	+ "728 x 90","728 x 90"
76	+ "800 x 66","800 x 66"
77	"<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>","<a href=""http://www.magentocommerce.com/paypal"">Start accepting payments via PayPal!</a>"
78	"A case that has been resolved and close requires a reimbursement.","A case that has been resolved and close requires a reimbursement."
79	"A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof.","A reversal has occurred on this transaction because of a customer dispute suspecting unauthorized spoof."

110	"Address","Address"
111	"Address Verification System Response","Address Verification System Response"
112	"Advanced Settings","Advanced Settings"
113	+ "Advertise Paypal Credit","Advertise Paypal Credit"
114	"All the address information matched","All the address information matched"
115	"Allow in Billing Agreement Wizard","Allow in Billing Agreement Wizard"
116	"Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile).","Allowable values: ""paypal"", ""primary"" (default), your_custom_value (a custom payment page style from your merchant account profile)."

124	"Authenticated, Good Result","Authenticated, Good Result"
125	"Authorization","Authorization"
126	"Authorization Honor Period (days)","Authorization Honor Period (days)"

127	"Authorization transaction is required to void.","Authorization transaction is required to void."

128	"Authorized amount of %s.","Authorized amount of %s."
129	"Authorizing amount of %s is pending approval on gateway.","Authorizing amount of %s is pending approval on gateway."
130	"Auto","Auto"

146	"Basic Settings - PayPal Website Payments Pro Hosted Solution","Basic Settings - PayPal Website Payments Pro Hosted Solution"
147	"Basic Settings - PayPal Website Payments Pro Payflow Edition","Basic Settings - PayPal Website Payments Pro Payflow Edition"
148	"Basic Settings - PayPal Website Payments Standard","Basic Settings - PayPal Website Payments Standard"

149	"Billing Agreement Signup","Billing Agreement Signup"
150	+ "Billing Information","Billing Information"
151	"Bonus for first ACH Use","Bonus for first ACH Use"
152	"Both section above must be complete. ","Both section above must be complete. "
153	"Buyer Credit Payment","Buyer Credit Payment"

165	"CVV2 Check Result by PayPal","CVV2 Check Result by PayPal"
166	"Can not send new order email.","Can not send new order email."
167	"Cannot create target file for reading reports.","Cannot create target file for reading reports."
168	+ "Catalog Category Page","Catalog Category Page"
169	+ "Catalog Product Page","Catalog Product Page"
170	"Centinel API URL","Centinel API URL"
171	"Centinel Custom API URL","Centinel Custom API URL"
172	"Charge-off","Charge-off"
173	"Chargeback","Chargeback"
174	+ "Checkout Cart Page","Checkout Cart Page"
175	"Checkout with PayPal","Checkout with PayPal"
176	+ "Checkout with PayPal Paypal Credit","Checkout with PayPal Paypal Credit"
177	"Choose a secure bundled payment solution for your business.","Choose a secure bundled payment solution for your business."
178	"City","City"
179	"Click here if you are not redirected within 10 seconds...","Click here if you are not redirected within 10 seconds..."

195	"Custom","Custom"
196	"Custom Endpoint Hostname or IP-Address","Custom Endpoint Hostname or IP-Address"
197	"Custom Path","Custom Path"

198	"Customer did not include a confirmed address.","Customer did not include a confirmed address."


199	"Daily","Daily"
200	"Debit","Debit"
201	"Debit Card Cash Back","Debit Card Cash Back"

204	"Debug Mode","Debug Mode"
205	"Direct Payment API","Direct Payment API"
206	"Discount","Discount"
207	+ "Display","Display"
208	"Display Express Checkout in the Payment Information step","Display Express Checkout in the Payment Information step"
209	+ "Display on Product Details Page","Display on Product Details Page"
210	+ "Display on Shopping Cart","Display on Shopping Cart"
211	"Displays on catalog pages and homepage.","Displays on catalog pages and homepage."
212	"Dispute","Dispute"
213	"Don't have a PayPal account? Simply enter your email address.","Don't have a PayPal account? Simply enter your email address."
214	"Dynamic","Dynamic"
215	"EFT Funding (German banking)","EFT Funding (German banking)"
216	+ "Edit","Edit"
217	+ "Edit Payment Information","Edit Payment Information"
218	"Edit Shopping Cart","Edit Shopping Cart"
219	"Email Address","Email Address"
220	"Email Associated with PayPal Merchant Account","Email Associated with PayPal Merchant Account"

223	"Enable Express Checkout","Enable Express Checkout"
224	"Enable PayPal Guest Checkout","Enable PayPal Guest Checkout"
225	"Enable Payflow Link","Enable Payflow Link"
226	+ "Enable Paypal Credit","Enable Paypal Credit"
227	"Enable SSL verification","Enable SSL verification"
228	"Enable this Solution","Enable this Solution"
229	"Enabled","Enabled"

238	"Exact Match. Address and Postal Code. International","Exact Match. Address and Postal Code. International"
239	"Exact Match. Address and Postal Code. UK-specific","Exact Match. Address and Postal Code. UK-specific"
240	"Exact Match. Address and nine-digit ZIP code","Exact Match. Address and nine-digit ZIP code"

241	"Express Checkout","Express Checkout"
242	"Express Checkout APIs","Express Checkout APIs"
243	"Express Checkout and Order have been canceled.","Express Checkout and Order have been canceled."

278	"General: reversal of a type not belonging to the other T11xx categories","General: reversal of a type not belonging to the other T11xx categories"
279	"General: temporary hold of a type not belonging to the other T15xx categories","General: temporary hold of a type not belonging to the other T15xx categories"
280	"Get Credentials from PayPal","Get Credentials from PayPal"
281	+ "Get Publisher ID from PayPal","Get Publisher ID from PayPal"
282	"Gift Certificate Payment: purchase of Gift Certificate","Gift Certificate Payment: purchase of Gift Certificate"
283	"Gift Certificate Redemption","Gift Certificate Redemption"
284	"Gross Amount","Gross Amount"
285	+ "Header (center)","Header (center)"
286	"Header Background Color","Header Background Color"
287	"Header Border Color","Header Border Color"
288	"Header Image URL","Header Image URL"
289	"Help","Help"
290	"Hidden Virtual PayPal Debit Card Transaction","Hidden Virtual PayPal Debit Card Transaction"
291	"Hold for Dispute Investigation","Hold for Dispute Investigation"
292	+ "Home Page","Home Page"
293	+ "I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you.","I'm sorry - but we are not able to complete your transaction. Please contact us so we can assist you."
294	+ "I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you.","I'm sorry - but we were not able to process your payment. Please try another payment method or contact us so we can assist you."
295	"IPN ""%s"".","IPN ""%s""."
296	"IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s""","IPN ""%s"". %s Transaction amount %s. Transaction ID: ""%s"""
297	"IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s.","IPN ""%s"". A dispute has been resolved and closed. %s Transaction amount %s."
298	"IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s","IPN ""%s"". Case type ""%s"". Case ID ""%s"" %s"

299	"If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement.","If empty, a default value will be used. Custom URL may be provided by CardinalCommerce agreement."
300	"If not specified, Default Country from General Config will be used","If not specified, Default Country from General Config will be used"
301	"If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only.","If this option is enabled, customer can change shipping address and shipping method on PayPal website. In live mode works via HTTPS protocol only."

327	"Merchant Location","Merchant Location"
328	"Merchant Protection Eligibility","Merchant Protection Eligibility"
329	"Merchant Referral Bonus","Merchant Referral Bonus"



330	"Merchant holds a non-U.S. account and does not have a withdrawal mechanism.","Merchant holds a non-U.S. account and does not have a withdrawal mechanism."

331	"Merchant reference ID format is not supported.","Merchant reference ID format is not supported."
332	"Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account.","Merchants need to apply to PayPal for enabling billing agreements feature. Do not enable this option until PayPal confirms that billing agreements are enabled for your merchant account."
333	+ "Mobile Optimized","Mobile Optimized"
334	"Mobile Payment (made via a mobile phone)","Mobile Payment (made via a mobile phone)"

335	"N/A","N/A"
336	"N/A. Address not checked, or acquirer had no response. Service not available","N/A. Address not checked, or acquirer had no response. Service not available"
337	"N/A. Global Unavailable","N/A. Global Unavailable"

347	"N/A. The merchant did not provide AVS information","N/A. The merchant did not provide AVS information"
348	"N/A. The merchant has not implemented CVV2 code handling","N/A. The merchant has not implemented CVV2 code handling"
349	"N/A. Unavailable","N/A. Unavailable"
350	+ "Near Paypal Credit checkout button","Near Paypal Credit checkout button"
351	"Negative Balance","Negative Balance"
352	"Never","Never"
353	"No","No"

388	"PayPal Express Checkout Shortcut Wrapper","PayPal Express Checkout Shortcut Wrapper"
389	"PayPal Express Checkout Token does not exist.","PayPal Express Checkout Token does not exist."
390	"PayPal Express Checkout is not enabled.","PayPal Express Checkout is not enabled."
391	+ "PayPal Express Checkout lets you give customers access to financing through Paypal Credit® - at no additional cost to you.
392	+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Paypal Credit®.
393	+ <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
394	+ ","PayPal Express Checkout lets you give customers access to financing through Paypal Credit® - at no additional cost to you.
395	+ You get paid up front, even though customers have more time to pay. A pre-integrated payment button lets customers pay quickly with Paypal Credit®.
396	+ <a href=""https://www.paypal.com/webapps/mpp/promotional-financing"" target=""_blank"">Learn More</a>
397	+ "
398	"PayPal Express Order Review Form","PayPal Express Order Review Form"
399	"PayPal Fee Information","PayPal Fee Information"
400	"PayPal Merchant Pages Style","PayPal Merchant Pages Style"

406	"PayPal Reference ID","PayPal Reference ID"
407	"PayPal Reference ID Type","PayPal Reference ID Type"
408	"PayPal Settlement Reports","PayPal Settlement Reports"
409	+ "PayPal Website Payments Standard","PayPal Website Payments Standard"
410	"PayPal certificate does not exist.","PayPal certificate does not exist."
411	"PayPal certificate file is empty.","PayPal certificate file is empty."
412	"PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process.","PayPal does not support processing orders with zero amount. To complete your purchase, proceed to the standard checkout process."

430	"Payflow Pro and Express Checkout","Payflow Pro and Express Checkout"
431	"Payment Action","Payment Action"
432	"Payment Applicable From","Payment Applicable From"
433	+ "Payment Method","Payment Method"
434	"Payment Refund initiated by merchant","Payment Refund initiated by merchant"
435	"Payment has been declined. Please try again.","Payment has been declined. Please try again."

436	"Payment transactions disallow storing objects.","Payment transactions disallow storing objects."

437	"Payments Advanced","Payments Advanced"
438	"Payments Advanced (Includes Express Checkout)","Payments Advanced (Includes Express Checkout)"
439	"Payments Pro (Includes Express Checkout)","Payments Pro (Includes Express Checkout)"
440	"Payments Pro Hosted Solution","Payments Pro Hosted Solution"
441	"Payments Pro and Express Checkout","Payments Pro and Express Checkout"
442	"Payments Standard","Payments Standard"
443	+ "Payments Standard (Includes Express Checkout)","Payments Standard (Includes Express Checkout)"
444	"Payments by PayPal (150 X 40)","Payments by PayPal (150 X 40)"
445	"Payments by PayPal (150 X 60)","Payments by PayPal (150 X 60)"
446	"Pending PayPal","Pending PayPal"
447	"Place Order","Place Order"
448	"Please agree to all the terms and conditions before placing the order.","Please agree to all the terms and conditions before placing the order."

449	"Please do not refresh the page until you complete payment.","Please do not refresh the page until you complete payment."
450	"Please re-enable the previously enabled payment solutions.","Please re-enable the previously enabled payment solutions."
451	"Please select a shipping method...","Please select a shipping method..."
452	"Please select region, state or province","Please select region, state or province"
453	"Please update order data to get shipping methods and rates","Please update order data to get shipping methods and rates"
454	"Points Incentive Redemption","Points Incentive Redemption"
455	+ "Position","Position"
456	"Postage Payment to either USPS or UPS","Postage Payment to either USPS or UPS"
457	"Preapproved Payment (BillUser API), either sent or received","Preapproved Payment (BillUser API), either sent or received"
458	"Preapproved Payment ID","Preapproved Payment ID"
459	"Price","Price"
460	"Pro","Pro"
461	"Process payments using your own internet merchant account.","Process payments using your own internet merchant account."
462	+ "Product","Product"
463	"Product Name","Product Name"
464	"Proxy Host","Proxy Host"
465	"Proxy Port","Proxy Port"
466	+ "Publisher ID","Publisher ID"
467	"Qty","Qty"
468	"Reauthorization","Reauthorization"
469	"Reference Information","Reference Information"
470	+ "Refunded amount of %s. Transaction ID: ""%s""","Refunded amount of %s. Transaction ID: ""%s"""
471	"Reimbursement for a chargeback.","Reimbursement for a chargeback."
472	"Reimbursement of Chargeback","Reimbursement of Chargeback"
473	"Report Date","Report Date"
474	"Reports","Reports"

475	"Require CVV Entry","Require CVV Entry"
476	"Require Customer's Billing Address","Require Customer's Billing Address"
477	"Required PayPal Settings","Required PayPal Settings"
478	"Required Settings","Required Settings"
479	+ "Required to display a banner","Required to display a banner"
480	"Reversal","Reversal"
481	"Reversal of General Account Hold","Reversal of General Account Hold"
482	"Reversal of Points Usage","Reversal of Points Usage"

504	"Severe validation removes chargeback liability on merchant.","Severe validation removes chargeback liability on merchant."
505	"Shipping","Shipping"
506	"Shipping Address","Shipping Address"
507	+ "Shipping Information","Shipping Information"
508	"Shipping Method","Shipping Method"
509	"Shop now using (150 X 40)","Shop now using (150 X 40)"
510	"Shop now using (150 X 60)","Shop now using (150 X 60)"
511	"Shortcut","Shortcut"
512	"Shortcut Buttons Flavor","Shortcut Buttons Flavor"
513	+ "Sidebar (right)","Sidebar (right)"

514	"Sign a billing agreement to streamline further purchases with PayPal.","Sign a billing agreement to streamline further purchases with PayPal."
515	+ "Size","Size"
516	+ "Skip Order Review Step","Skip Order Review Step"
517	"Solo","Solo"
518	"Some PayPal solutions conflict.","Some PayPal solutions conflict."
519	"Sorry, no quotes are available for this order at this time.","Sorry, no quotes are available for this order at this time."

553	"This operation requires an existing transaction object.","This operation requires an existing transaction object."
554	"Time of Day","Time of Day"
555	"Title","Title"
556	+ "To proceed to Checkout, please log in using your email address.","To proceed to Checkout, please log in using your email address."
557	"Transaction ID","Transaction ID"
558	"Transaction ID must not be empty.","Transaction ID must not be empty."
559	+ "Transaction ID: ""%s""","Transaction ID: ""%s"""
560	"Transaction Information","Transaction Information"
561	"Transaction reversal by PayPal administrators.","Transaction reversal by PayPal administrators."
562	"Transaction reversal due to fraud detected by PayPal administrators.","Transaction reversal due to fraud detected by PayPal administrators."

572	"Unable to place the order.","Unable to place the order."
573	"Unable to process Express Checkout approval.","Unable to process Express Checkout approval."
574	"Unable to start Express Checkout.","Unable to start Express Checkout."

575	"Unable to update shipping method.","Unable to update shipping method."
576	"Unknown Error. Please try again later.","Unknown Error. Please try again later."
577	"Unknown reason. Please contact PayPal customer service.","Unknown reason. Please contact PayPal customer service."
578	+ "Update Shipping Method","Update Shipping Method"
579	"Use Proxy","Use Proxy"
580	"Use colon to specify port. For example: ""test.example.com:5224"".","Use colon to specify port. For example: ""test.example.com:5224""."
581	"User","User"

590	"Virtual PayPal Debit Card Transaction","Virtual PayPal Debit Card Transaction"
591	"Virtual Terminal Payment","Virtual Terminal Payment"
592	"Void","Void"

593	"We prefer PayPal (150 X 40)","We prefer PayPal (150 X 40)"
594	"We prefer PayPal (150 X 60)","We prefer PayPal (150 X 60)"
595	"Website Payments Plus","Website Payments Plus"

601	"Website Payments Pro Payflow Edition and Express Checkout","Website Payments Pro Payflow Edition and Express Checkout"
602	"Website Payments Pro and Express Checkout","Website Payments Pro and Express Checkout"
603	"Website Payments Standard","Website Payments Standard"
604	+ "Website Payments Standard (Includes Express Checkout)","Website Payments Standard (Includes Express Checkout)"
605	"Website Payments Standard Payment","Website Payments Standard Payment"
606	"What is PayPal?","What is PayPal?"
607	"Whether to create a billing agreement, if there are no active billing agreements available.","Whether to create a billing agreement, if there are no active billing agreements available."
608	"Will appear as a payment option only for customers who have at least one active billing agreement.","Will appear as a payment option only for customers who have at least one active billing agreement."
609	"WorldLink Withdrawal","WorldLink Withdrawal"
610	"Would you like to sign a billing agreement to streamline further purchases with PayPal?","Would you like to sign a billing agreement to streamline further purchases with PayPal?"

611	"Wrong PayPal Express Checkout Token specified.","Wrong PayPal Express Checkout Token specified."
612	"Yes","Yes"
613	+ "Yes (PayPal recommends this option)","Yes (PayPal recommends this option)"
614	"Yes. Matched Address and five-didgit ZIP","Yes. Matched Address and five-didgit ZIP"
615	"You cannot void a verification transaction","You cannot void a verification transaction"
616	"You will be redirected to the PayPal website in a few seconds.","You will be redirected to the PayPal website in a few seconds."

618	"You will be redirected to the PayPal website.","You will be redirected to the PayPal website."
619	"You will be required to enter your payment details after you place an order.","You will be required to enter your payment details after you place an order."
620	"Zip/Postal Code","Zip/Postal Code"





621	"eBay Auction Payment","eBay Auction Payment"

app/locale/en_US/Mage_Persistent.csv CHANGED Viewed

	@@ -7,7 +7,9 @@
7	"Back","Back"
8	"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."
9	"Cannot load configuration from file %s.","Cannot load configuration from file %s."

10	"Checkout as Guest","Checkout as Guest"

11	"Checkout as a Guest or Register","Checkout as a Guest or Register"
12	"City","City"
13	"Clear Persistence on Log Out","Clear Persistence on Log Out"
	@@ -22,6 +24,7 @@
22	"Enable ""Remember Me""","Enable ""Remember Me"""
23	"Enable Persistence","Enable Persistence"
24	"Fast and easy check out","Fast and easy check out"

25	"Fax","Fax"
26	"Forgot Your Password?","Forgot Your Password?"
27	"Forgot your password?","Forgot your password?"
	@@ -32,26 +35,33 @@
32	"Login Information","Login Information"
33	"Login or Create an Account","Login or Create an Account"
34	"New Customers","New Customers"

35	"Password","Password"
36	"Persist Shopping Cart","Persist Shopping Cart"
37	"Persistence Lifetime (seconds)","Persistence Lifetime (seconds)"
38	"Persistent Shopping Cart","Persistent Shopping Cart"
39	"Personal Information","Personal Information"

40	"Please log in below:","Please log in below:"
41	"Please select region, state or province","Please select region, state or province"
42	"Register","Register"

43	"Register and save time!","Register and save time!"
44	"Register to Create an Account","Register to Create an Account"
45	"Register with us for future convenience:","Register with us for future convenience:"
46	"Registered Customers","Registered Customers"

47	"Remember Me","Remember Me"

48	"Save in address book","Save in address book"

49	"Select State/Province...","Select State/Province..."
50	"Select a billing address from your address book or enter a new address.","Select a billing address from your address book or enter a new address."
51	"Ship to different address","Ship to different address"
52	"Ship to this address","Ship to this address"
53	"Shopping cart has been updated with appropriate prices","Shopping cart has been updated with appropriate prices"
54	"Sign Up for Newsletter","Sign Up for Newsletter"

55	"State/Province","State/Province"
56	"Street Address","Street Address"
57	"Street Address %s","Street Address %s"
	@@ -59,6 +69,8 @@
59	"Telephone","Telephone"
60	"To proceed to Checkout, please log in using your email address.","To proceed to Checkout, please log in using your email address."
61	"VAT Number","VAT Number"

62	"Welcome, %s!","Welcome, %s!"

63	"What\'s this?","What\'s this?"
64	"Zip/Postal Code","Zip/Postal Code"


7	"Back","Back"
8	"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."
9	"Cannot load configuration from file %s.","Cannot load configuration from file %s."
10	+ "Checking "Remember Me" will let you access your shopping cart on this computer when you are logged out","Checking "Remember Me" will let you access your shopping cart on this computer when you are logged out"
11	"Checkout as Guest","Checkout as Guest"
12	+ "Checkout as a Guest","Checkout as a Guest"
13	"Checkout as a Guest or Register","Checkout as a Guest or Register"
14	"City","City"
15	"Clear Persistence on Log Out","Clear Persistence on Log Out"

24	"Enable ""Remember Me""","Enable ""Remember Me"""
25	"Enable Persistence","Enable Persistence"
26	"Fast and easy check out","Fast and easy check out"
27	+ "Faster checkout","Faster checkout"
28	"Fax","Fax"
29	"Forgot Your Password?","Forgot Your Password?"
30	"Forgot your password?","Forgot your password?"

35	"Login Information","Login Information"
36	"Login or Create an Account","Login or Create an Account"
37	"New Customers","New Customers"
38	+ "New Here?","New Here?"
39	"Password","Password"
40	"Persist Shopping Cart","Persist Shopping Cart"
41	"Persistence Lifetime (seconds)","Persistence Lifetime (seconds)"
42	"Persistent Shopping Cart","Persistent Shopping Cart"
43	"Personal Information","Personal Information"
44	+ "Please enter the following information to create your account.","Please enter the following information to create your account."
45	"Please log in below:","Please log in below:"
46	"Please select region, state or province","Please select region, state or province"
47	"Register","Register"
48	+ "Register and Checkout","Register and Checkout"
49	"Register and save time!","Register and save time!"
50	"Register to Create an Account","Register to Create an Account"
51	"Register with us for future convenience:","Register with us for future convenience:"
52	"Registered Customers","Registered Customers"
53	+ "Registration is free and easy!","Registration is free and easy!"
54	"Remember Me","Remember Me"
55	+ "Returning Customers","Returning Customers"
56	"Save in address book","Save in address book"
57	+ "Save multiple shipping addresses","Save multiple shipping addresses"
58	"Select State/Province...","Select State/Province..."
59	"Select a billing address from your address book or enter a new address.","Select a billing address from your address book or enter a new address."
60	"Ship to different address","Ship to different address"
61	"Ship to this address","Ship to this address"
62	"Shopping cart has been updated with appropriate prices","Shopping cart has been updated with appropriate prices"
63	"Sign Up for Newsletter","Sign Up for Newsletter"
64	+ "Sign in to speed up your checkout process","Sign in to speed up your checkout process"
65	"State/Province","State/Province"
66	"Street Address","Street Address"
67	"Street Address %s","Street Address %s"

69	"Telephone","Telephone"
70	"To proceed to Checkout, please log in using your email address.","To proceed to Checkout, please log in using your email address."
71	"VAT Number","VAT Number"
72	+ "View and track orders and more","View and track orders and more"
73	"Welcome, %s!","Welcome, %s!"
74	+ "What's this?","What's this?"
75	"What\'s this?","What\'s this?"
76	"Zip/Postal Code","Zip/Postal Code"

app/locale/en_US/Mage_Review.csv CHANGED Viewed

	@@ -2,9 +2,13 @@
2	"%s Review(s)","%s Review(s)"
3	"(Posted on %s)","(Posted on %s)"
4	"1 star","1 star"

5	"2 stars","2 stars"

6	"3 stars","3 stars"

7	"4 stars","4 stars"

8	"5 stars","5 stars"
9	"<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
10	"Add New Review","Add New Review"
	@@ -39,6 +43,7 @@
39	"Guest","Guest"
40	"How do you rate this product?","How do you rate this product?"
41	"ID","ID"

42	"Manage Ratings","Manage Ratings"
43	"My Product Reviews","My Product Reviews"
44	"My Recent Reviews","My Recent Reviews"
	@@ -70,9 +75,11 @@
70	"Review (submitted on %s):","Review (submitted on %s):"
71	"Review Details","Review Details"
72	"Review Form Fields Before","Review Form Fields Before"

73	"Review by <span>%s</span>","Review by <span>%s</span>"
74	"Review can\'t be empty","Review can\'t be empty"
75	"Review summary can\'t be empty","Review summary can\'t be empty"

76	"Reviews and Ratings","Reviews and Ratings"
77	"SKU","SKU"
78	"Save Review","Save Review"
	@@ -89,6 +96,7 @@
89	"View Details","View Details"
90	"Visible In","Visible In"
91	"Websites","Websites"

92	"Write Your Own Review","Write Your Own Review"
93	"You have submitted no reviews.","You have submitted no reviews."
94	"You're reviewing:","You're reviewing:"


2	"%s Review(s)","%s Review(s)"
3	"(Posted on %s)","(Posted on %s)"
4	"1 star","1 star"
5	+ "2 star","2 star"
6	"2 stars","2 stars"
7	+ "3 star","3 star"
8	"3 stars","3 stars"
9	+ "4 star","4 star"
10	"4 stars","4 stars"
11	+ "5 star","5 star"
12	"5 stars","5 stars"
13	"<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>","<a href=""%1$s"" onclick=""this.target=\'blank\'"">%2$s %3$s</a> <a href=""mailto:%4$s"">(%4$s)</a>"
14	"Add New Review","Add New Review"

43	"Guest","Guest"
44	"How do you rate this product?","How do you rate this product?"
45	"ID","ID"
46	+ "Let us know your thoughts","Let us know your thoughts"
47	"Manage Ratings","Manage Ratings"
48	"My Product Reviews","My Product Reviews"
49	"My Recent Reviews","My Recent Reviews"

75	"Review (submitted on %s):","Review (submitted on %s):"
76	"Review Details","Review Details"
77	"Review Form Fields Before","Review Form Fields Before"
78	+ "Review by %s","Review by %s"
79	"Review by <span>%s</span>","Review by <span>%s</span>"
80	"Review can\'t be empty","Review can\'t be empty"
81	"Review summary can\'t be empty","Review summary can\'t be empty"
82	+ "Reviews","Reviews"
83	"Reviews and Ratings","Reviews and Ratings"
84	"SKU","SKU"
85	"Save Review","Save Review"

96	"View Details","View Details"
97	"Visible In","Visible In"
98	"Websites","Websites"
99	+ "What's your nickname?","What's your nickname?"
100	"Write Your Own Review","Write Your Own Review"
101	"You have submitted no reviews.","You have submitted no reviews."
102	"You're reviewing:","You're reviewing:"

app/locale/en_US/Mage_Rule.csv CHANGED Viewed

	@@ -19,22 +19,12 @@
19	"by","by"
20	"contains","contains"
21	"does not contain","does not contain"
22	- "does not contains","does not contains"
23	"equals or greater than","equals or greater than"
24	"equals or less than","equals or less than"
25	- "for","for"
26	- "for greater than","for greater than"
27	- "for or greater than","for or greater than"
28	- "found","found"
29	- "from","from"
30	"greater than","greater than"
31	"is","is"
32	"is not","is not"
33	"is not one of","is not one of"
34	"is one of","is one of"
35	"less than","less than"
36	- "not found","not found"
37	- "not from","not from"
38	"to","to"
39	- "was","was"
40	- "was not","was not"


19	"by","by"
20	"contains","contains"
21	"does not contain","does not contain"

22	"equals or greater than","equals or greater than"
23	"equals or less than","equals or less than"





24	"greater than","greater than"
25	"is","is"
26	"is not","is not"
27	"is not one of","is not one of"
28	"is one of","is one of"
29	"less than","less than"


30	"to","to"

app/locale/en_US/Mage_Sales.csv CHANGED Viewed

	@@ -155,7 +155,6 @@
155	"Create New Order for New Customer","Create New Order for New Customer"
156	"Create New Order for New Customer in %s","Create New Order for New Customer in %s"
157	"Create New Status","Create New Status"
158	- "Create Order","Create Order"
159	"Create Packages","Create Packages"
160	"Create Shipment","Create Shipment"
161	"Create Shipping Label","Create Shipping Label"
	@@ -168,7 +167,7 @@
168	"Created billing agreement #%s.","Created billing agreement #%s."
169	"Created:","Created:"
170	"Credit Memo","Credit Memo"
171	- "Credit Memo #","Credit Memo # "
172	"Credit Memo # ","Credit Memo # "
173	"Credit Memo #%1$s \| %3$s \| %2$s (%4$s)","Credit Memo #%1$s \| %3$s \| %2$s (%4$s)"
174	"Credit Memo Comment Email Sender","Credit Memo Comment Email Sender"
	@@ -259,7 +258,6 @@
259	"Gift Message for the Entire Order","Gift Message for the Entire Order"
260	"Gift Message for this Order","Gift Message for this Order"
261	"Gift Options","Gift Options"
262	- "Gift Wrapping for the Entire Order","Gift Wrapping for the Entire Order"
263	"Girth","Girth"
264	"Go to Home Page","Go to Home Page"
265	"Grand Total","Grand Total"
	@@ -273,7 +271,6 @@
273	"Home","Home"
274	"ID","ID"
275	"ID #","ID #"
276	- "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."
277	"If empty, the default description above will be used.","If empty, the default description above will be used."
278	"If empty, the default error above will be used.","If empty, the default error above will be used."
279	"If the invoice was created offline, try creating an offline creditmemo.","If the invoice was created offline, try creating an offline creditmemo."
	@@ -295,7 +292,7 @@
295	"Invalid request for adding product to quote.","Invalid request for adding product to quote."
296	"Invalid value(s) for Qty to Ship","Invalid value(s) for Qty to Ship"
297	"Invoice","Invoice"
298	- "Invoice #","Invoice # "
299	"Invoice # ","Invoice # "
300	"Invoice #%1$s \| %2$s \| %4$s (%3$s)","Invoice #%1$s \| %2$s \| %4$s (%3$s)"
301	"Invoice #%s","Invoice #%s"
	@@ -319,6 +316,7 @@
319	"Invoice void problem","Invoice void problem"
320	"Invoice will be created without communication with payment gateway.","Invoice will be created without communication with payment gateway."
321	"Invoiced","Invoiced"

322	"Invoices","Invoices"
323	"Is Closed","Is Closed"
324	"Item","Item"
	@@ -417,7 +415,7 @@
417	"On Hold","On Hold"
418	"Online Refunded","Online Refunded"
419	"Order","Order"
420	- "Order #","Order # "
421	"Order # ","Order # "
422	"Order # %s","Order # %s"
423	"Order # %s %s \| %s","Order # %s %s \| %s"
	@@ -866,6 +864,7 @@
866	"You have placed no orders.","You have placed no orders."
867	"You will be redirected to the payment system website.","You will be redirected to the payment system website."
868	"Your credit card will be charged for","Your credit card will be charged for"

869	"ZIP/Post Code","ZIP/Post Code"
870	"Zip/Postal Code","Zip/Postal Code"
871	"cm","cm"


155	"Create New Order for New Customer","Create New Order for New Customer"
156	"Create New Order for New Customer in %s","Create New Order for New Customer in %s"
157	"Create New Status","Create New Status"

158	"Create Packages","Create Packages"
159	"Create Shipment","Create Shipment"
160	"Create Shipping Label","Create Shipping Label"

167	"Created billing agreement #%s.","Created billing agreement #%s."
168	"Created:","Created:"
169	"Credit Memo","Credit Memo"
170	+ "Credit Memo #","Credit Memo #"
171	"Credit Memo # ","Credit Memo # "
172	"Credit Memo #%1$s \| %3$s \| %2$s (%4$s)","Credit Memo #%1$s \| %3$s \| %2$s (%4$s)"
173	"Credit Memo Comment Email Sender","Credit Memo Comment Email Sender"

258	"Gift Message for the Entire Order","Gift Message for the Entire Order"
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"

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."

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 # "
297	"Invoice #%1$s \| %2$s \| %4$s (%3$s)","Invoice #%1$s \| %2$s \| %4$s (%3$s)"
298	"Invoice #%s","Invoice #%s"

316	"Invoice void problem","Invoice void problem"
317	"Invoice will be created without communication with payment gateway.","Invoice will be created without communication with payment gateway."
318	"Invoiced","Invoiced"
319	+ "Invoiced:","Invoiced:"
320	"Invoices","Invoices"
321	"Is Closed","Is Closed"
322	"Item","Item"

415	"On Hold","On Hold"
416	"Online Refunded","Online Refunded"
417	"Order","Order"
418	+ "Order #","Order #"
419	"Order # ","Order # "
420	"Order # %s","Order # %s"
421	"Order # %s %s \| %s","Order # %s %s \| %s"

864	"You have placed no orders.","You have placed no orders."
865	"You will be redirected to the payment system website.","You will be redirected to the payment system website."
866	"Your credit card will be charged for","Your credit card will be charged for"
867	+ "ZIP Code","ZIP Code"
868	"ZIP/Post Code","ZIP/Post Code"
869	"Zip/Postal Code","Zip/Postal Code"
870	"cm","cm"

app/locale/en_US/Mage_SalesRule.csv CHANGED Viewed

	@@ -120,6 +120,7 @@
120	"Update prices using the following information","Update prices using the following information"
121	"Update product's %s %s: %s","Update product's %s %s: %s"
122	"Update the Product","Update the Product"

123	"Use Auto Generation","Use Auto Generation"
124	"Used","Used"
125	"Uses per Coupon","Uses per Coupon"


120	"Update prices using the following information","Update prices using the following information"
121	"Update product's %s %s: %s","Update product's %s %s: %s"
122	"Update the Product","Update the Product"
123	+ "Usage limit enforced for logged in customers only","Usage limit enforced for logged in customers only"
124	"Use Auto Generation","Use Auto Generation"
125	"Used","Used"
126	"Uses per Coupon","Uses per Coupon"

app/locale/en_US/Mage_Shipping.csv CHANGED Viewed

	@@ -9,7 +9,6 @@
9	"Close Window","Close Window"
10	"Condition","Condition"
11	"Country","Country"
12	- "Custom Value","Custom Value"
13	"Date","Date"
14	"Delivered on:","Delivered on:"
15	"Delivered to:","Delivered to:"


9	"Close Window","Close Window"
10	"Condition","Condition"
11	"Country","Country"

12	"Date","Date"
13	"Delivered on:","Delivered on:"
14	"Delivered to:","Delivered to:"

app/locale/en_US/Mage_Tax.csv CHANGED Viewed

	@@ -47,6 +47,7 @@
47	"Edit Class '%s'","Edit Class '%s'"
48	"Edit Rule","Edit Rule"
49	"Edit Tax Rate","Edit Tax Rate"

50	"Excel XML","Excel XML"
51	"Excl. Tax","Excl. Tax"
52	"Excl. Tax:","Excl. Tax:"
	@@ -149,6 +150,7 @@
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."
154	"Yes","Yes"


47	"Edit Class '%s'","Edit Class '%s'"
48	"Edit Rule","Edit Rule"
49	"Edit Tax Rate","Edit Tax Rate"
50	+ "Enable Cross Border Trade","Enable Cross Border Trade"
51	"Excel XML","Excel XML"
52	"Excl. Tax","Excl. Tax"
53	"Excl. Tax:","Excl. Tax:"

150	"Warning tax configuration can result in rounding errors","Warning tax configuration can result in rounding errors"
151	"Warning tax configuration can result in unexpected FPT prices on applicable devices","Warning tax configuration can result in unexpected FPT prices on applicable devices"
152	"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"
153	+ "When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is.","When catalog price includes tax, enable this setting will fix the price no matter what the customer's tax rate is."
154	"Whether catalog prices entered by admin include tax.","Whether catalog prices entered by admin include tax."
155	"Whether shipping amounts entered by admin or obtained from gateways include tax.","Whether shipping amounts entered by admin or obtained from gateways include tax."
156	"Yes","Yes"

app/locale/en_US/Mage_Usa.csv CHANGED Viewed

	@@ -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"
	@@ -25,7 +24,6 @@
25	"Allowed Methods","Allowed Methods"
26	"Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges.","Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges."
27	"Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges."
28	- "Bound Printed Matter","Bound Printed Matter"
29	"Break bulk economy","Break bulk economy"
30	"Break bulk express","Break bulk express"
31	"Business Service Center","Business Service Center"
	@@ -81,7 +79,6 @@
81	"Express 10:30 AM","Express 10:30 AM"
82	"Express 12:00","Express 12:00"
83	"Express 9:00","Express 9:00"
84	- "Express Mail","Express Mail"
85	"Express Saturday","Express Saturday"
86	"Express Saver","Express Saver"
87	"Express easy","Express easy"
	@@ -96,7 +93,6 @@
96	"FedEx Pak","FedEx Pak"
97	"FedEx Tube","FedEx Tube"
98	"First Overnight","First Overnight"
99	- "First-Class","First-Class"
100	"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope"
101	"First-Class Mail International Letter","First-Class Mail International Letter"
102	"First-Class Mail International Postcard","First-Class Mail International Postcard"
	@@ -151,12 +147,11 @@
151	"Large Express Box","Large Express Box"
152	"Length","Length"
153	"Letter","Letter"
154	- "Library","Library"
155	- "Library Mail","Library Mail"
156	"Live","Live"
157	"Machinable","Machinable"
158	"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
159	- "Media Mail","Media Mail"
160	"Medical express","Medical express"
161	"Medium Express Box","Medium Express Box"
162	"Merchandise","Merchandise"
	@@ -194,7 +189,6 @@
194	"Packaging","Packaging"
195	"Pallet","Pallet"
196	"Parcel","Parcel"
197	- "Parcel Post","Parcel Post"
198	"Password","Password"
199	"Pickup Method","Pickup Method"
200	"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"

24	"Allowed Methods","Allowed Methods"
25	"Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges.","Allows breaking total order weight into smaller pieces if it exeeds %s %s to ensure accurate calculation of shipping charges."
26	"Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges.","Allows breaking total order weight into smaller pieces if it exeeds 70 kg to ensure accurate calculation of shipping charges."

27	"Break bulk economy","Break bulk economy"
28	"Break bulk express","Break bulk express"
29	"Business Service Center","Business Service Center"

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"

93	"FedEx Pak","FedEx Pak"
94	"FedEx Tube","FedEx Tube"
95	"First Overnight","First Overnight"

96	"First-Class Mail International Large Envelope","First-Class Mail International Large Envelope"
97	"First-Class Mail International Letter","First-Class Mail International Letter"
98	"First-Class Mail International Postcard","First-Class Mail International Postcard"

147	"Large Express Box","Large Express Box"
148	"Length","Length"
149	"Letter","Letter"
150	+ "Library Mail Parcel","Library Mail Parcel"

151	"Live","Live"
152	"Machinable","Machinable"
153	"Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)","Maximum Package Weight (Please consult your shipping carrier for maximum supported shipping weight)"
154	+ "Media Mail Parcel","Media Mail Parcel"
155	"Medical express","Medical express"
156	"Medium Express Box","Medium Express Box"
157	"Merchandise","Merchandise"

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 Viewed

	@@ -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"
	@@ -22,4 +21,3 @@
22	"Total Incl. Tax","Total Incl. Tax"
23	"Total excl. tax","Total excl. tax"
24	"Total incl. tax","Total incl. tax"
25	- "Total:","Total:"


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"

21	"Total Incl. Tax","Total Incl. Tax"
22	"Total excl. tax","Total excl. tax"
23	"Total incl. tax","Total incl. tax"

app/locale/en_US/Mage_Wishlist.csv CHANGED Viewed

	@@ -21,8 +21,8 @@
21	"Can\'t save description %s","Can\'t save description %s"
22	"Can\'t update wishlist","Can\'t update wishlist"
23	"Cannot add item to shopping cart","Cannot add item to shopping cart"
24	- "Cannot add the following product(s) to shopping cart: %s.","Cannot add the following product(s) to shopping cart: %s."
25	"Cannot add the item to shopping cart.","Cannot add the item to shopping cart."

26	"Cannot configure product","Cannot configure product"
27	"Cannot load wishlist item","Cannot load wishlist item"
28	"Cannot move item to wishlist","Cannot move item to wishlist"
	@@ -36,7 +36,6 @@
36	"Comment:","Comment:"
37	"Configure Wishlist Item","Configure Wishlist Item"
38	"Configured Price:","Configured Price:"
39	- "Could not find such wishlist","Could not find such wishlist"
40	"Could not find wishlist","Could not find wishlist"
41	"Customer My Account My Wishlist","Customer My Account My Wishlist"
42	"Customer My Account Wishlist Sharing Form","Customer My Account Wishlist Sharing Form"
	@@ -66,10 +65,11 @@
66	"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com."
67	"Please input a valid email address.","Please input a valid email address."
68	"Please, enter your comments...","Please, enter your comments..."

69	"Product","Product"
70	"Product Details and Comment","Product Details and Comment"
71	"Product(s) %s have required options. Each of them can be added to cart separately only.","Product(s) %s have required options. Each of them can be added to cart separately only."
72	- "~~Product(s) %s have required options. Each product can only be added individually.~~","~~Product(s) %s have required options. Each product can only be added individually.~~"
73	"RSS Feed","RSS Feed"
74	"RSS link to %s's wishlist","RSS link to %s's wishlist"
75	"Remove Item","Remove Item"
	@@ -77,6 +77,7 @@
77	"Remove item","Remove item"
78	"Requested cart item doesn't exist","Requested cart item doesn't exist"
79	"Requested wishlist doesn't exist","Requested wishlist doesn't exist"

80	"Share Options","Share Options"
81	"Share Wishlist","Share Wishlist"
82	"Share Your Wishlist","Share Your Wishlist"


21	"Can\'t save description %s","Can\'t save description %s"
22	"Can\'t update wishlist","Can\'t update wishlist"
23	"Cannot add item to shopping cart","Cannot add item to shopping cart"

24	"Cannot add the item to shopping cart.","Cannot add the item to shopping cart."
25	+ "Cannot add the selected product to shopping cart because the product was removed from the wishlist","Cannot add the selected product to shopping cart because the product was removed from the wishlist"
26	"Cannot configure product","Cannot configure product"
27	"Cannot load wishlist item","Cannot load wishlist item"
28	"Cannot move item to wishlist","Cannot move item to wishlist"

36	"Comment:","Comment:"
37	"Configure Wishlist Item","Configure Wishlist Item"
38	"Configured Price:","Configured Price:"

39	"Could not find wishlist","Could not find wishlist"
40	"Customer My Account My Wishlist","Customer My Account My Wishlist"
41	"Customer My Account Wishlist Sharing Form","Customer My Account Wishlist Sharing Form"

65	"Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com.","Please enter a valid email addresses, separated by commas. For example johndoe@domain.com, johnsmith@domain.com."
66	"Please input a valid email address.","Please input a valid email address."
67	"Please, enter your comments...","Please, enter your comments..."
68	+ "Price","Price"
69	"Product","Product"
70	"Product Details and Comment","Product Details and Comment"
71	"Product(s) %s have required options. Each of them can be added to cart separately only.","Product(s) %s have required options. Each of them can be added to cart separately only."
72	+ "Qty","Qty"
73	"RSS Feed","RSS Feed"
74	"RSS link to %s's wishlist","RSS link to %s's wishlist"
75	"Remove Item","Remove Item"

77	"Remove item","Remove item"
78	"Requested cart item doesn't exist","Requested cart item doesn't exist"
79	"Requested wishlist doesn't exist","Requested wishlist doesn't exist"
80	+ "SKU","SKU"
81	"Share Options","Share Options"
82	"Share Wishlist","Share Wishlist"
83	"Share Your Wishlist","Share Your Wishlist"

app/locale/en_US/template/email/account_new.html CHANGED Viewed

@@ -9,47 +9,37 @@
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
                    <tr>
-            -
                        <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                            <!-- [ header starts here] -->
-            -
                            <table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                                <tr>
-            -
                                    <td valign="top">
-            -
                                        <a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                                </tr>
-            -
                            <!-- [ middle starts here] -->
-            -
                                <tr>
-            -
                                    <td valign="top">
-            -
                                        <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Dear {{htmlescape var=$customer.name}},</h1>
-            -
                                        <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Welcome to {{var store.getFrontendName()}}. To log in when visiting our site just click <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">Login</a> or <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">My Account</a> at the top of every page, and then enter your e-mail address and password.</p>
-            -
                                        <p style="border:1px solid #E0E0E0; font-size:12px; line-height:16px; margin:0; padding:13px 18px; background:#f9f9f9;">
-            -
                                            Use the following values when prompted to log in:<br/>
-            -
                                            <strong>E-mail</strong>: {{var customer.email}}<br/>
-            -
                                            <strong>Password</strong>: {{htmlescape var=$customer.password}}<p>
-            -
                                        <p style="font-size:12px; line-height:16px; margin:0 0 8px 0;">When you log in to your account, you will be able to do the following:</p>
-            -
                                        <ul style="font-size:12px; line-height:16px; margin:0 0 16px 0; padding:0;">
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; Proceed through checkout faster when making a purchase</li>
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; Check the status of orders</li>
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; View past orders</li>
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; Make changes to your account information</li>
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; Change your password</li>
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; Store alternative addresses (for shipping to multiple family members and friends!)</li>
-            -
                                        </ul>
-            -
                                        <p style="font-size:12px; line-height:16px; margin:0;">If you have any questions about your account or any other matter, please feel free to contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or by phone at {{config path='general/store_information/phone'}}.</p>
-            -
                                    </td>
-            -
                                </tr>
-            -
                                <tr>
-            -
                                    <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                                </tr>
-            -
                            </table>
-            -
                        </td>
-            -
                    </tr>
-            -
                </table>
-            -
            </div>
-            -
            </body>


9	@-->
10
11	<!--@styles

12	@-->
13
14	+ {{template config_path="design/email/header"}}
15	+ {{inlinecss file="email-inline.css"}}
16	+
17	+ <table cellpadding="0" cellspacing="0" border="0">
18	+ <tr>
19	+ <td class="action-content">
20	+ <h1>Welcome to {{var store.getFrontendName()}}.</h1>
21	+ <p>To log in when visiting our site just click <a href="{{store url="customer/account/"}}">Login</a> or <a href="{{store url="customer/account/"}}">My Account</a> at the top of every page, and then enter your email address and password.</p>
22	+ <p class="highlighted-text">
23	+ Use the following values when prompted to log in:<br/>
24	+ <strong>Email</strong>: {{var customer.email}}<br/>
25	+ <strong>Password</strong>: {{htmlescape var=$customer.password}}
26	+ </p>
27	+ <p>When you log in to your account, you will be able to do the following:</p>
28	+ <ul>
29	+ <li>Proceed through checkout faster when making a purchase</li>
30	+ <li>Check the status of orders</li>
31	+ <li>View past orders</li>
32	+ <li>Make changes to your account information</li>
33	+ <li>Change your password</li>
34	+ <li>Store alternative addresses (for shipping to multiple family members and friends!)</li>
35	+ </ul>
36	+ <p>
37	+ If you have any questions, please feel free to contact us at
38	+ <a href="mailto:{{var store_email}}">{{var store_email}}</a>
39	+ {{depend store_phone}} or by phone at <a href="tel:{{var phone}}">{{var store_phone}}</a>{{/depend}}.
40	+ </p>
41	+ </td>
42	+ </tr>
43	+ </table>
44	+
45	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/account_new_confirmation.html CHANGED Viewed

@@ -11,40 +11,42 @@
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
                    <tr>
-            -
                        <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                            <!-- [ header starts here] -->
-            -
                            <table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                                <tr>
-            -
                                    <td valign="top">
-            -
                                        <a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a>
-            -
                                    </td>
-            -
                                </tr>
-            -
                                <!-- [ middle starts here] -->
-            -
                                <tr>
-            -
                                    <td valign="top">
-            -
                                        <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{htmlescape var=$customer.name}},</h1>
-            -
                                        <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Your e-mail {{var customer.email}} must be confirmed before using it to log in to our store.</p>
-            -
                                        <p style="font-size:12px; line-height:16px; margin:0 0 8px 0;">To confirm the e-mail and instantly log in, please, use <a href="{{store url="customer/account/confirm/" _query_id=$customer.id _query_key=$customer.confirmation _query_back_url=$back_url}}" style="color:#1E7EC8;">this confirmation link</a>. This link is valid only once.</p>
-            -
                                        <p style="border:1px solid #E0E0E0; font-size:12px; line-height:16px; margin:0 0 16px 0; padding:13px 18px; background:#f9f9f9;">
-            -
                                            Use the following values when prompted to log in:<br/>
-            -
                                            <strong>E-mail:</strong> {{var customer.email}}<br/>
-            -
                                            <strong>Password:</strong> {{htmlescape var=$customer.password}}<p>
-            -
                                        <p style="font-size:12px; line-height:16px; margin:0;">If you have any questions about your account or any other matter, please feel free to contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or by phone at {{config path='general/store_information/phone'}}.</p>
-            -
                                    </td>
-            -
                                </tr>
-            -
                                <tr>
-            -
                                    <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                                </tr>
-            -
                            </table>
-            -
                        </td>
-            -
                    </tr>
-            -
                </table>
-            -
            </div>
-            -
            </body>


11	@-->
12
13	<!--@styles

14	@-->
15
16	+ {{template config_path="design/email/header"}}
17	+ {{inlinecss file="email-inline.css"}}
18	+
19	+ <table cellpadding="0" cellspacing="0" border="0">
20	+ <tr>
21	+ <td>
22	+ <table cellpadding="0" cellspacing="0" border="0">
23	+ <tr>
24	+ <td class="action-content">
25	+ <h1>{{htmlescape var=$customer.name}},</h1>
26	+ <p>Your email {{var customer.email}} must be confirmed before using it to log in to our store.</p>
27	+ <p class="highlighted-text">
28	+ Use the following values when prompted to log in:<br/>
29	+ <strong>Email:</strong> {{var customer.email}}<br/>
30	+ <strong>Password:</strong> {{htmlescape var=$customer.password}}
31	+ </p>
32	+ <p>Click here to confirm your email and instantly log in (the link is valid only once):</p>
33	+ <table cellspacing="0" cellpadding="0" class="action-button" >
34	+ <tr>
35	+ <td>
36	+ <a href="{{store url="customer/account/confirm/" _query_id=$customer.id _query_key=$customer.confirmation _query_back_url=$back_url}}"><span>Confirm Account</span></a>
37	+ </td>
38	+ </tr>
39	+ </table>
40	+ <p>
41	+ If you have any questions, please feel free to contact us at
42	+ <a href="mailto:{{var store_email}}">{{var store_email}}</a>
43	+ {{depend store_phone}} or by phone at <a href="tel:{{var phone}}">{{var store_phone}}</a>{{/depend}}.
44	+ </p>
45	+ </td>
46	+ </tr>
47	+ </table>
48	+ </td>
49	+ </tr>
50	+ </table>
51	+
52	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/account_new_confirmed.html CHANGED Viewed

@@ -8,44 +8,32 @@
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
                    <tr>
-            -
                        <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                            <!-- [ header starts here] -->
-            -
                            <table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                                <tr>
-            -
                                    <td valign="top">
-            -
                                        <a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a>
-            -
                                    </td>
-            -
                                </tr>
-            -
                                <!-- [ middle starts here] -->
-            -
                                <tr>
-            -
                                    <td valign="top">
-            -
                                        <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Dear {{htmlescape var=$customer.name}},</h1>
-            -
                                        <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Welcome to {{var store.getFrontendName()}}. To log in when visiting our site just click <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">Login</a> or <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">My Account</a> at the top of every page, and then enter your e-mail address and password.</p>
-            -
                                        <p style="font-size:12px; line-height:16px; margin:0 0 8px 0;">When you log in to your account, you will be able to do the following:</p>
-            -
                                        <ul style="font-size:12px; line-height:16px; margin:0 0 16px 0; padding:0;">
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; Proceed through checkout faster when making a purchase</li>
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; Check the status of orders</li>
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; View past orders</li>
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; Make changes to your account information</li>
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; Change your password</li>
-            -
                                            <li style="list-style:none inside; padding:0 0 0 10px;">&ndash; Store alternative addresses (for shipping to multiple family members and friends!)</li>
-            -
                                        </ul>
-            -
                                        <p style="font-size:12px; line-height:16px; margin:0;">If you have any questions about your account or any other matter, please feel free to contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or by phone at {{config path='general/store_information/phone'}}.</p>
-            -
                                    </td>
-            -
                                </tr>
-            -
                                <tr>
-            -
                                    <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                                </tr>
-            -
                            </table>
-            -
                        </td>
-            -
                    </tr>
-            -
                </table>
-            -
            </div>
-            -
            </body>


8	@-->
9
10	<!--@styles

11	@-->
12
13	+ {{template config_path="design/email/header"}}
14	+ {{inlinecss file="email-inline.css"}}
15	+
16	+ <table cellpadding="0" cellspacing="0" border="0">
17	+ <tr>
18	+ <td class="action-content">
19	+ <h1>{{htmlescape var=$customer.name}},</h1>
20	+ <p>To log in when visiting our site just click <a href="{{store url="customer/account/"}}">Login</a> or <a href="{{store url="customer/account/"}}">My Account</a> at the top of every page, and then enter your email address and password.</p>
21	+ <p>When you log in to your account, you will be able to do the following:</p>
22	+ <ul>
23	+ <li>Proceed through checkout faster when making a purchase</li>
24	+ <li>Check the status of orders</li>
25	+ <li>View past orders</li>
26	+ <li>Make changes to your account information</li>
27	+ <li>Change your password</li>
28	+ <li>Store alternative addresses (for shipping to multiple family members and friends!)</li>
29	+ </ul>
30	+ <p>
31	+ If you have any questions, please feel free to contact us at
32	+ <a href="mailto:{{var store_email}}">{{var store_email}}</a>
33	+ {{depend store_phone}} or by phone at <a href="tel:{{var phone}}">{{var store_phone}}</a>{{/depend}}.
34	+ </p>
35	+ </td>
36	+ </tr>
37	+ </table>
38	+
39	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/account_password_reset_confirmation.html CHANGED Viewed

@@ -8,36 +8,27 @@
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background: #F6F6F6; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; margin: 0; padding: 0;">
-            -
                <div style="background: #F6F6F6; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; margin: 0; padding: 0;">
-            -
                    <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
                        <tr>
-            -
                            <td align="center" valign="top" style="padding: 20px 0 20px 0">
-            -
                                <table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                                    <tr>
-            -
                                        <td valign="top">
-            -
                                            <a href="{{store url=""}}" style="color:#1E7EC8;"><img src="{{var logo_url}}" alt="{{var logo_alt}}" border="0"/></a>
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    <tr>
-            -
                                        <td valign="top">
-            -
                                            <h1 style="font-size: 22px; font-weight: normal; line-height: 22px; margin: 0 0 11px 0;">Dear {{htmlescape var=$customer.name}},</h1>
-            -
                                            <p style="font-size: 12px; line-height: 16px; margin: 0 0 8px 0;">There was recently a request to change the password for your account.</p>
-            -
                                            <p style="font-size: 12px; line-height: 16px; margin: 0;">If you requested this password change, please click on the following link to reset your password: <a href="{{store url="customer/account/resetpassword/" _query_id=$customer.id _query_token=$customer.rp_token}}" style="color:#1E7EC8;">{{store url="customer/account/resetpassword/" _query_id=$customer.id _query_token=$customer.rp_token}}</a></p>
-            -
                                            <p style="font-size: 12px; line-height: 16px; margin: 0;">If clicking the link does not work, please copy and paste the URL into your browser instead.</p>
-            -
                                            <br />
-            -
                                            <p style="font-size:12px; line-height:16px; margin:0;">If you did not make this request, you can ignore this message and your password will remain the same.</p>
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    <tr>
-            -
                                        <td style="background-color: #EAEAEA; text-align: center;"><p style="font-size:12px; margin:0; text-align: center;">Thank you, <strong>{{var store.getFrontendName()}}</strong></p></td>
-            -
                                    </tr>
-            -
                                </table>
-            -
                            </td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </div>
-            -
            </body>


8	@-->
9
10	<!--@styles

11	@-->
12
13	+ {{template config_path="design/email/header"}}
14	+ {{inlinecss file="email-inline.css"}}
15	+
16	+ <table cellpadding="0" cellspacing="0" border="0">
17	+ <tr>
18	+ <td class="action-content">
19	+ <h1>{{htmlescape var=$customer.name}},</h1>
20	+ <p>There was recently a request to change the password for your account.</p>
21	+ <p>If you requested this password change, please reset your password here:</p>
22	+ <table cellspacing="0" cellpadding="0" class="action-button" >
23	+ <tr>
24	+ <td>
25	+ <a href="{{store url="customer/account/resetpassword/" _query_id=$customer.id _query_token=$customer.rp_token}}"><span>Reset Password</span></a>
26	+ </td>
27	+ </tr>
28	+ </table>
29	+ <p>If you did not make this request, you can ignore this message and your password will remain the same.</p>
30	+ </td>
31	+ </tr>
32	+ </table>
33	+
34	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/admin_password_new.html CHANGED Viewed

@@ -9,35 +9,19 @@
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
                 <tr>
-            -
                    <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                        <!-- [ header starts here] -->
-            -
                        <table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                            <tr>
-            -
                                <td valign="top">
-            -
                                    <a href="{{store url=""}}" style="color:#1E7EC8;"><img src="{{var logo_url}}" alt="{{var logo_alt}}" border="0"/></a>
-            -
                                </td>
-            -
                            </tr>
-            -
                            <!-- [ middle starts here] -->
-            -
                            <tr>
-            -
                                <td valign="top">
-            -
                                    <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Dear {{htmlescape var=$user.name}},</h1>
-            -
                                    <p style="font-size:12px; line-height:16px; margin:0 0 8px 0;"><strong>Your new password is:</strong> {{htmlescape var=$password}}</p>
-            -
                                    <p style="font-size:12px; line-height:16px; margin:0;">You can change your password at any time by logging into <a href="{{store url="adminhtml/system_account/"}}" style="color:#1E7EC8;">your account</a>.<p>
-            -
                                </td>
-            -
                            </tr>
-            -
                            <tr>
-            -
                                <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                            </tr>
-            -
                        </table>
                     </td>
                 </tr>
             </table>
-            -
            </div>
-            -
            </body>


9	@-->
10
11	<!--@styles

12	@-->
13
14	+ {{template config_path="design/email/header"}}
15	+ {{inlinecss file="email-inline.css"}}
16	+
17	+ <table cellpadding="0" cellspacing="0" border="0">
18	<tr>
19	+ <td class="action-content">
20	+ <h1>{{htmlescape var=$user.name}},</h1>
21	+ <p><strong>Your new password is:</strong> {{htmlescape var=$password}}</p>
22	+ <p>You can change your password at any time by logging into <a href="{{store url="adminhtml/system_account/"}}">your account</a>.</p>
















23	</td>
24	</tr>
25	</table>
26	+
27	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/admin_password_reset_confirmation.html CHANGED Viewed

@@ -9,36 +9,28 @@
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background: #F6F6F6; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; margin: 0; padding: 0;">
-            -
                <div style="background: #F6F6F6; font-family: Verdana, Arial, Helvetica, sans-serif; font-size: 12px; margin: 0; padding: 0;">
-            -
                    <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
                        <tr>
-            -
                            <td align="center" valign="top" style="padding: 20px 0 20px 0">
-            -
                                <table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                                    <tr>
-            -
                                        <td valign="top">
-            -
                                            <a href="{{store url=""}}" style="color:#1E7EC8;"><img src="{{var logo_url}}" alt="{{var logo_alt}}" border="0"/></a>
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    <tr>
-            -
                                        <td valign="top">
-            -
                                            <h1 style="font-size: 22px; font-weight: normal; line-height: 22px; margin: 0 0 11px 0;">Dear {{htmlescape var=$user.name}},</h1>
-            -
                                            <p style="font-size: 12px; line-height: 16px; margin: 0 0 8px 0;">There was recently a request to change the password for your account.</p>
-            -
                                            <p style="font-size: 12px; line-height: 16px; margin: 0;">If you requested this password change, please click on the following link to reset your password: <a href="{{store url="adminhtml/index/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}" style="color:#1E7EC8;">{{store url="adminhtml/index/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}</a></p>
-            -
                                            <p style="font-size: 12px; line-height: 16px; margin: 0;">If clicking the link does not work, please copy and paste the URL into your browser instead.</p>
-            -
                                            <br />
-            -
                                            <p style="font-size:12px; line-height:16px; margin:0;">If you did not make this request, you can ignore this message and your password will remain the same.</p>
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    <tr>
-            -
                                        <td style="background-color: #EAEAEA; text-align: center;"><p style="font-size:12px; margin:0; text-align: center;">Thank you, <strong>{{var store.getFrontendName()}}</strong></p></td>
-            -
                                    </tr>
-            -
                                </table>
-            -
                            </td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </div>
-            -
            </body>


9	@-->
10
11	<!--@styles

12	@-->
13
14	+ {{template config_path="design/email/header"}}
15	+ {{inlinecss file="email-inline.css"}}
16	+
17	+ <table cellpadding="0" cellspacing="0" border="0">
18	+ <tr>
19	+ <td class="action-content">
20	+ <h1>{{htmlescape var=$user.name}},</h1>
21	+ <p>There was recently a request to change the password for your account.</p>
22	+ <p>You can change your password at any time by logging into <a href="{{store url="adminhtml/system_account/"}}">your account</a>.</p>
23	+ <p>If you requested this password change, click here to reset your password:</p>
24	+ <table cellspacing="0" cellpadding="0" class="action-button">
25	+ <tr>
26	+ <td>
27	+ <a href="{{store url="adminhtml/index/resetpassword/" _query_id=$user.id _query_token=$user.rp_token}}"><span>Reset Password</span></a>
28	+ </td>
29	+ </tr>
30	+ </table>
31	+ <p>If you did not make this request, you can ignore this message and your password will remain the same.</p>
32	+ </td>
33	+ </tr>
34	+ </table>
35	+
36	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/contact_form.html CHANGED Viewed

	@@ -6,7 +6,7 @@
6	"var data.comment":"Comment"}
7	@-->
8	Name: {{var data.name}}
9	- ~~E-mail~~: {{var data.email}}
10	Telephone: {{var data.telephone}}
11
12	Comment: {{var data.comment}}


6	"var data.comment":"Comment"}
7	@-->
8	Name: {{var data.name}}
9	+ Email: {{var data.email}}
10	Telephone: {{var data.telephone}}
11
12	Comment: {{var data.comment}}

app/locale/en_US/template/email/currency_update_warning.html CHANGED Viewed

	@@ -2,7 +2,6 @@
2	<!--@vars
3	{"var warnings":"Currency Update Warnings"}
4	@-->
5	- Currency update warnings:
6	-
7
8	- ~~{{var~~ warnings}}


2	<!--@vars
3	{"var warnings":"Currency Update Warnings"}
4	@-->


5
6	+ Currency update warnings:
7	+ {{var warnings}}

app/locale/en_US/template/email/html/footer.html ADDED Viewed

	@@ -0,0 +1,11 @@


1	+ <!--@subject Email - Footer @-->
2	+ <!-- End Content -->
3	+ </td>
4	+ </tr>
5	+ </table>
6	+ <h5 class="closing-text">Thank you, {{var store.getFrontendName()}}!</h5>
7	+ </td>
8	+ </tr>
9	+ </table>
10	+ <!-- End wrapper table -->
11	+ </body>

app/locale/en_US/template/email/html/header.html ADDED Viewed

	@@ -0,0 +1,45 @@


1	+ <!--@subject Email - Header @-->
2	+ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3	+ <html xmlns="http://www.w3.org/1999/xhtml">
4	+ <head>
5	+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
6	+ <meta name="viewport" content="initial-scale=1.0, width=device-width" />
7	+ </head>
8	+ <body>
9	+ {{var non_inline_styles}}
10	+ <!-- Begin wrapper table -->
11	+ <table width="100%" cellpadding="0" cellspacing="0" border="0" id="background-table">
12	+ <tr>
13	+ <td valign="top" class="container-td" align="center">
14	+ <table cellpadding="0" cellspacing="0" border="0" align="center" class="container-table">
15	+ <tr>
16	+ <td>
17	+ <table cellpadding="0" cellspacing="0" border="0" class="logo-container">
18	+ <tr>
19	+ <td class="logo">
20	+ <a href="{{store url=""}}">
21	+ <img
22	+ {{if logo_width}}
23	+ width="{{var logo_width}}"
24	+ {{else}}
25	+ width="165"
26	+ {{/if}}
27	+
28	+ {{if logo_height}}
29	+ height="{{var logo_height}}"
30	+ {{else}}
31	+ height="48"
32	+ {{/if}}
33	+
34	+ src="{{var logo_url}}"
35	+ alt="{{var logo_alt}}"
36	+ border="0"/>
37	+ </a>
38	+ </td>
39	+ </tr>
40	+ </table>
41	+ </td>
42	+ </tr>
43	+ <tr>
44	+ <td valign="top" class="top-content">
45	+ <!-- Begin Content -->

app/locale/en_US/template/email/log_clean_warning.html CHANGED Viewed

	@@ -4,4 +4,4 @@
4	@-->
5	Log Cleanup Warnings:
6
7	- {{var warnings}}


4	@-->
5	Log Cleanup Warnings:
6
7	+ {{var warnings}}

app/locale/en_US/template/email/newsletter_subscr_confirm.html CHANGED Viewed

@@ -7,35 +7,25 @@
             "var subscriber.getConfirmationLink()":"Subscriber Confirmation Url"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
                 <tr>
-            -
                    <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                        <!-- [ header starts here] -->
-            -
                        <table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                            <tr>
-            -
                                <td valign="top">
-            -
                                    <a href="{{store url=""}}" style="color:#1E7EC8;"><img src="{{var logo_url}}" alt="{{var logo_alt}}" border="0"/></a>
-            -
                                </td>
-            -
                            </tr>
-            -
                            <!-- [ middle starts here] -->
                             <tr>
-            -
                                <td valign="top">
-            -
                                    <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Thank you for subscribing to our newsletter.</h1>
-            -
                                    <p style="border:1px solid #E0E0E0; font-size:12px; line-height:16px; margin:0; padding:13px 18px; background:#F9F9F9;">To begin receiving the newsletter, you must first confirm your subscription by clicking on the following link:<br />
-            -
                                    <a href="{{var subscriber.getConfirmationLink()}}" style="color:#1E7EC8;">{{var subscriber.getConfirmationLink()}}</a><p>
                                 </td>
                             </tr>
-            -
                            <tr>
-            -
                                <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                            </tr>
                         </table>
                     </td>
                 </tr>
             </table>
-            -
            </div>
-            -
            </body>


7	"var subscriber.getConfirmationLink()":"Subscriber Confirmation Url"}
8	@-->
9	<!--@styles

10	@-->
11
12	+ {{template config_path="design/email/header"}}
13	+ {{inlinecss file="email-inline.css"}}
14	+
15	+ <table cellpadding="0" cellspacing="0" border="0">
16	<tr>
17	+ <td class="action-content">
18	+ <h1>Thank you for subscribing.</h1>
19	+ <p>To begin receiving the newsletter, you must first confirm your subscription:</p>
20	+ <table cellspacing="0" cellpadding="0" class="action-button" >





21	<tr>
22	+ <td>
23	+ <a href="{{var subscriber.getConfirmationLink()}}"><span>Confirm Subscription</span></a>


24	</td>
25	</tr>



26	</table>
27	</td>
28	</tr>
29	</table>
30	+
31	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/newsletter_subscr_success.html CHANGED Viewed

@@ -1,2 +1,14 @@
             <!--@subject Newsletter subscription success @-->
-            -
            Newsletter subscription success


1	<!--@subject Newsletter subscription success @-->
2	+
3	+ {{template config_path="design/email/header"}}
4	+ {{inlinecss file="email-inline.css"}}
5	+
6	+ <table cellpadding="0" cellspacing="0" border="0">
7	+ <tr>
8	+ <td class="action-content">
9	+ <h4>You have been successfully subscribed to the newsletter.</h4>
10	+ </td>
11	+ </tr>
12	+ </table>
13	+
14	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/newsletter_unsub_success.html CHANGED Viewed

@@ -1,2 +1,14 @@
             <!--@subject Newsletter unsubscription success @-->
-            -
            Newsletter unsubscription success


1	<!--@subject Newsletter unsubscription success @-->
2	+
3	+ {{template config_path="design/email/header"}}
4	+ {{inlinecss file="email-inline.css"}}
5	+
6	+ <table cellpadding="0" cellspacing="0" border="0">
7	+ <tr>
8	+ <td class="action-content">
9	+ <h1>You have been unsubscribed from the newsletter.</h1>
10	+ </td>
11	+ </tr>
12	+ </table>
13	+
14	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/password_new.html CHANGED Viewed

@@ -8,35 +8,19 @@
             "htmlescape var=$customer.password":"Customer New Password"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
                 <tr>
-            -
                    <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                        <!-- [ header starts here] -->
-            -
                        <table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                            <tr>
-            -
                                <td valign="top">
-            -
                                    <a href="{{store url=""}}" style="color:#1E7EC8;"><img src="{{var logo_url}}" alt="{{var logo_alt}}" border="0"/></a>
-            -
                                </td>
-            -
                            </tr>
-            -
                            <!-- [ middle starts here] -->
-            -
                            <tr>
-            -
                                <td valign="top">
-            -
                                    <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{htmlescape var=$customer.name}},</h1>
-            -
                                    <p style="font-size:12px; line-height:16px; margin:0 0 8px 0;"><strong>Your new password is:</strong> {{htmlescape var=$customer.password}}</p>
-            -
                                    <p style="font-size:12px; line-height:16px; margin:0;">You can change your password at any time by logging into <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">your account</a>.<p>
-            -
                                </td>
-            -
                            </tr>
-            -
                            <tr>
-            -
                                <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                            </tr>
-            -
                        </table>
                     </td>
                 </tr>
             </table>
-            -
            </div>
-            -
            </body>


8	"htmlescape var=$customer.password":"Customer New Password"}
9	@-->
10	<!--@styles

11	@-->
12
13	+ {{template config_path="design/email/header"}}
14	+ {{inlinecss file="email-inline.css"}}
15	+
16	+ <table cellpadding="0" cellspacing="0" border="0">
17	<tr>
18	+ <td class="action-content">
19	+ <h1>{{htmlescape var=$customer.name}},</h1>
20	+ <p><strong>Your new password is:</strong> {{htmlescape var=$customer.password}}</p>
21	+ <p>You can change your password at any time by logging into <a href="{{store url="customer/account/"}}">your account</a>.</p>
















22	</td>
23	</tr>
24	</table>
25	+
26	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/payment_failed.html CHANGED Viewed

@@ -15,54 +15,54 @@
             <table>
                 <thead>
-            -
                    <tr>
-            -
                        <th>Payment transaction failed.</th>
-            -
                    </tr>
                 </thead>
                 <tbody>
-            -
                    <tr>
-            -
                        <td>
-            -
                            <p>
-            -
                                <b>Reason</b><br />
-            -
                                {{var reason}}
-            -
                            </p>
-            -
                            <p>
-            -
                                <b>Checkout Type</b><br />
-            -
                                {{var checkoutType}}
-            -
                            </p>
-            -
                            <p>
-            -
                                <b>Customer:</b><br />
-            -
                                <a href="mailto:{{var customerEmail}}">{{var customer}}</a> &lt;{{var customerEmail}}&gt;
-            -
                            </p>
-            -
                            <p>
-            -
                                <b>Items</b><br />
-            -
                                {{var items}}
-            -
                            </p>
-            -
                            <p>
-            -
                                <b>Total:</b><br />
-            -
                                {{var total}}
-            -
                            </p>
-            -
                            <p>
-            -
                                <b>Billing Address:</b><br />
-            -
                                {{var billingAddress.format('html')}}
-            -
                            </p>
-            -
                            <p>
-            -
                                <b>Shipping Address:</b><br />
-            -
                                {{var shippingAddress.format('html')}}
-            -
                            </p>
-            -
                            <p>
-            -
                                <b>Shipping Method:</b><br />
-            -
                                {{var shippingMethod}}
-            -
                            </p>
-            -
                            <p>
-            -
                                <b>Payment Method:</b><br />
-            -
                                {{var paymentMethod}}
-            -
                            </p>
-            -
                            <p>
-            -
                                <b>Date & Time:</b><br />
-            -
                                {{var dateAndTime}}
-            -
                            </p>
-            -
                        </td>
-            -
                    </tr>
                 </tbody>
-            -
            </table>


15
16	<table>
17	<thead>
18	+ <tr>
19	+ <th>Payment transaction failed.</th>
20	+ </tr>
21	</thead>
22	<tbody>
23	+ <tr>
24	+ <td>
25	+ <p>
26	+ <b>Reason</b><br />
27	+ {{var reason}}
28	+ </p>
29	+ <p>
30	+ <b>Checkout Type</b><br />
31	+ {{var checkoutType}}
32	+ </p>
33	+ <p>
34	+ <b>Customer:</b><br />
35	+ <a href="mailto:{{var customerEmail}}">{{var customer}}</a> <{{var customerEmail}}>
36	+ </p>
37	+ <p>
38	+ <b>Items</b><br />
39	+ {{var items}}
40	+ </p>
41	+ <p>
42	+ <b>Total:</b><br />
43	+ {{var total}}
44	+ </p>
45	+ <p>
46	+ <b>Billing Address:</b><br />
47	+ {{var billingAddress.format('html')}}
48	+ </p>
49	+ <p>
50	+ <b>Shipping Address:</b><br />
51	+ {{var shippingAddress.format('html')}}
52	+ </p>
53	+ <p>
54	+ <b>Shipping Method:</b><br />
55	+ {{var shippingMethod}}
56	+ </p>
57	+ <p>
58	+ <b>Payment Method:</b><br />
59	+ {{var paymentMethod}}
60	+ </p>
61	+ <p>
62	+ <b>Date & Time:</b><br />
63	+ {{var dateAndTime}}
64	+ </p>
65	+ </td>
66	+ </tr>
67	</tbody>
68	+ </table>

app/locale/en_US/template/email/product_alert_cron_error.html CHANGED Viewed

	@@ -4,4 +4,4 @@
4	@-->
5	Product alerts cron warnings:
6
7	- {{var warnings}}


4	@-->
5	Product alerts cron warnings:
6
7	+ {{var warnings}}

app/locale/en_US/template/email/product_price_alert.html CHANGED Viewed

@@ -3,6 +3,17 @@
             {"var customerName":"Customer Name",
             "var alertGrid":"Alert Data Grid"}
             @-->
-            -
            Hello {{var customerName}},
-            -
            {{var alertGrid}}


3	{"var customerName":"Customer Name",
4	"var alertGrid":"Alert Data Grid"}
5	@-->
6	+ {{template config_path="design/email/header"}}
7	+ {{inlinecss file="email-inline.css"}}
8
9	+ <table cellpadding="0" cellspacing="0" border="0">
10	+ <tr>
11	+ <td class="action-content">
12	+ <h1>{{var customerName}},</h1>
13	+
14	+ {{var alertGrid}}
15	+ </td>
16	+ </tr>
17	+ </table>
18	+
19	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/product_share.html CHANGED Viewed

@@ -10,4 +10,21 @@
             "var message":"Sender Message"}
             @-->
-            -
            Welcome, {{htmlescape var=$name}}<br /><br />Please look at <a href="{{var product_url}}">{{var product_name}}</a><br /><br />Here is message: <br />{{var message}}<br /><br />


10	"var message":"Sender Message"}
11	@-->
12
13	+ {{template config_path="design/email/header"}}
14	+ {{inlinecss file="email-inline.css"}}
15	+
16	+ <table cellpadding="0" cellspacing="0" border="0">
17	+ <tr>
18	+ <td class="action-content">
19	+ <h1>{{htmlescape var=$name}},</h1>
20	+ <p>Your friend wants to share this product with you: <a href="{{var product_url}}">{{var product_name}}</a></p>
21	+ <table cellspacing="0" cellpadding="0" class="message-container">
22	+ <tr>
23	+ <td><strong>Message:</strong> {{var message}}</td>
24	+ </tr>
25	+ </table>
26	+ </td>
27	+ </tr>
28	+ </table>
29	+
30	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/product_stock_alert.html CHANGED Viewed

@@ -3,6 +3,17 @@
             {"var customerName":"Customer Name",
             "var alertGrid":"Alert Data Grid"}
             @-->
-            -
            Hello {{var customerName}},
-            -
            {{var alertGrid}}


3	{"var customerName":"Customer Name",
4	"var alertGrid":"Alert Data Grid"}
5	@-->
6	+ {{template config_path="design/email/header"}}
7	+ {{inlinecss file="email-inline.css"}}
8
9	+ <table cellpadding="0" cellspacing="0" border="0">
10	+ <tr>
11	+ <td class="action-content">
12	+ <h1>{{var customerName}},</h1>
13	+
14	+ {{var alertGrid}}
15	+ </td>
16	+ </tr>
17	+ </table>
18	+
19	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/creditmemo_new.html CHANGED Viewed

@@ -16,93 +16,83 @@
             "var comment":"Credit Memo Comment"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                    <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
-            -
                                <p>
-            -
                                    Thank you for your order from {{var store.getFrontendName()}}.
-            -
                                    You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.
-            -
                                    If you have any questions about your order please contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or call us at <span class="nobr">{{config path='general/store_information/phone'}}</span> Monday - Friday, 8am - 5pm PST.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <h2 style="font-size:18px; font-weight:normal; margin:0;">Your Credit Memo #{{var creditmemo.increment_id}} for Order #{{var order.increment_id}}</h2>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Billing Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Payment Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.billing_address.format('html')}}
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var payment_html}}
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{depend order.getIsNotVirtual()}}
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_address.format('html')}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_description}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{/depend}}
-            -
                                {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}}
-            -
                                <p style="font-size:12px; margin:0 10px 10px 0">{{var comment}}</p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


16	"var comment":"Credit Memo Comment"}
17	@-->
18	<!--@styles

19	@-->
20
21	+ {{template config_path="design/email/header"}}
22	+ {{inlinecss file="email-inline.css"}}
23	+
24	+ <table cellpadding="0" cellspacing="0" border="0">
25	+ <tr>
26	+ <td>
27	+ <table cellpadding="0" cellspacing="0" border="0">
28	+ <tr>
29	+ <td class="email-heading">
30	+ <h1>Thank you for your order from {{var store.getFrontendName()}}.</h1>
31	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}"">logging into your account</a>.</p>
32	+ </td>
33	+ <td class="store-info">
34	+ <h4>Order Questions?</h4>
35	+ <p>
36	+ {{depend store_phone}}
37	+ <b>Call Us:</b>
38	+ <a href="tel:{{var phone}}">{{var store_phone}}</a><br>
39	+ {{/depend}}
40	+ {{depend store_hours}}
41	+ <span class="no-link">{{var store_hours}}</span><br>
42	+ {{/depend}}
43	+ {{depend store_email}}
44	+ <b>Email:</b> <a href="mailto:{{var store_email}}">{{var store_email}}</a>
45	+ {{/depend}}
46	+ </p>
47	+ </td>
48	+ </tr>
49	+ </table>
50	+ </td>
51	+ </tr>
52	+ <tr>
53	+ <td class="order-details">
54	+ <h3>Your Credit Memo <span class="no-link">#{{var creditmemo.increment_id}}</span></h3>
55	+ <p>Order <span class="no-link">#{{var order.increment_id}}</span></p>
56	+ </td>
57	+ </tr>
58	+ <tr class="order-information">
59	+ <td>
60	+ {{if comment}}
61	+ <table cellspacing="0" cellpadding="0" class="message-container">
62	+ <tr>
63	+ <td>{{var comment}}</td>
64	+ </tr>
65	+ </table>
66	+ {{/if}}
67	+ {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}}
68	+ <table cellpadding="0" cellspacing="0" border="0">
69	+ <tr>
70	+ <td class="address-details">
71	+ <h6>Bill to:</h6>
72	+ <p><span class="no-link">{{var order.billing_address.format('html')}}</span></p>
73	+ </td>
74	+ {{depend order.getIsNotVirtual()}}
75	+ <td class="address-details">
76	+ <h6>Ship to:</h6>
77	+ <p><span class="no-link">{{var order.shipping_address.format('html')}}</span></p>
78	+ </td>
79	+ {{/depend}}
80	+ </tr>
81	+ <tr>
82	{{depend order.getIsNotVirtual()}}
83	+ <td class="method-info">
84	+ <h6>Shipping method:</h6>
85	+ <p>{{var order.shipping_description}}</p>
86	+ </td>



















87	{{/depend}}
88	+ <td class="method-info">
89	+ <h6>Payment method:</h6>
90	+ {{var payment_html}}
91	+ </td>
92	+ </tr>
93	+ </table>
94	+ </td>
95	+ </tr>


96	</table>
97	+
98	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/creditmemo_new_guest.html CHANGED Viewed

@@ -15,92 +15,83 @@
             "var comment":"Credit Memo Comment"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                    <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$billing.getName()}}</h1>
-            -
                                <p>
-            -
                                    Thank you for your order from {{var store.getFrontendName()}}.
-            -
                                    If you have any questions about your order please contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or call us at <span class="nobr">{{config path='general/store_information/phone'}}</span> Monday - Friday, 8am - 5pm PST.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <h2 style="font-size:18px; font-weight:normal; margin:0;">Your Credit Memo #{{var creditmemo.increment_id}} for Order #{{var order.increment_id}}</h2>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Billing Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Payment Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.billing_address.format('html')}}
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var payment_html}}
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{depend order.getIsNotVirtual()}}
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_address.format('html')}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_description}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{/depend}}
-            -
                                {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}}
-            -
                                <p style="font-size:12px; margin:0 10px 10px 0">{{var comment}}</p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


15	"var comment":"Credit Memo Comment"}
16	@-->
17	<!--@styles

18	@-->
19
20	+ {{template config_path="design/email/header"}}
21	+ {{inlinecss file="email-inline.css"}}
22	+
23	+ <table cellpadding="0" cellspacing="0" border="0">
24	+ <tr>
25	+ <td>
26	+ <table cellpadding="0" cellspacing="0" border="0">
27	+ <tr>
28	+ <td class="email-heading">
29	+ <h1>Thank you for your order from {{var store.getFrontendName()}}.</h1>
30	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}"">logging into your account</a>.</p>
31	+ </td>
32	+ <td class="store-info">
33	+ <h4>Order Questions?</h4>
34	+ <p>
35	+ {{depend store_phone}}
36	+ <b>Call Us:</b>
37	+ <a href="tel:{{var phone}}">{{var store_phone}}</a><br>
38	+ {{/depend}}
39	+ {{depend store_hours}}
40	+ <span class="no-link">{{var store_hours}}</span><br>
41	+ {{/depend}}
42	+ {{depend store_email}}
43	+ <b>Email:</b> <a href="mailto:{{var store_email}}">{{var store_email}}</a>
44	+ {{/depend}}
45	+ </p>
46	+ </td>
47	+ </tr>
48	+ </table>
49	+ </td>
50	+ </tr>
51	+ <tr>
52	+ <td class="order-details">
53	+ <h3>Your Credit Memo <span class="no-link">#{{var creditmemo.increment_id}}</span></h3>
54	+ <p>Order <span class="no-link">#{{var order.increment_id}}</span></p>
55	+ </td>
56	+ </tr>
57	+ <tr class="order-information">
58	+ <td>
59	+ {{if comment}}
60	+ <table cellspacing="0" cellpadding="0" class="message-container">
61	+ <tr>
62	+ <td>{{var comment}}</td>
63	+ </tr>
64	+ </table>
65	+ {{/if}}
66	+ {{layout handle="sales_email_order_creditmemo_items" creditmemo=$creditmemo order=$order}}
67	+ <table cellpadding="0" cellspacing="0" border="0">
68	+ <tr>
69	+ <td class="address-details">
70	+ <h6>Bill to:</h6>
71	+ <p><span class="no-link">{{var order.billing_address.format('html')}}</span></p>
72	+ </td>
73	+ {{depend order.getIsNotVirtual()}}
74	+ <td class="address-details">
75	+ <h6>Ship to:</h6>
76	+ <p><span class="no-link">{{var order.shipping_address.format('html')}}</span></p>
77	+ </td>
78	+ {{/depend}}
79	+ </tr>
80	+ <tr>
81	{{depend order.getIsNotVirtual()}}
82	+ <td class="method-info">
83	+ <h6>Shipping method:</h6>
84	+ <p>{{var order.shipping_description}}</p>
85	+ </td>



















86	{{/depend}}
87	+ <td class="method-info">
88	+ <h6>Payment method:</h6>
89	+ {{var payment_html}}
90	+ </td>
91	+ </tr>
92	+ </table>
93	+ </td>
94	+ </tr>


95	</table>
96	+
97	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/creditmemo_update.html CHANGED Viewed

@@ -11,42 +11,37 @@
             "var store.getFrontendName()":"Store Name"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                        <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{htmlescape var=$order.getCustomerName()}},</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">
-            -
                                    Your order # {{var order.increment_id}} has been <br/>
-            -
                                    <strong>{{var order.getStatusLabel()}}</strong>.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">{{var comment}}</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    If you have any questions, please feel free to contact us at
-            -
                                    <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a>
-            -
                                    or by phone at {{config path='general/store_information/phone'}}.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


11	"var store.getFrontendName()":"Store Name"}
12	@-->
13	<!--@styles

14	@-->
15
16	+ {{template config_path="design/email/header"}}
17	+ {{inlinecss file="email-inline.css"}}
18	+
19	+ <table cellpadding="0" cellspacing="0" border="0">
20	+ <tr>
21	+ <td>
22	+ <table cellpadding="0" cellspacing="0" border="0">
23	+ <tr>
24	+ <td class="action-content">
25	+ <h1>{{htmlescape var=$order.getCustomerName()}},</h1>
26	+ <p>Your order <span class="no-link">#{{var order.increment_id}}</span> has been updated to: <strong>{{var order.getStatusLabel()}}</strong></p>
27	+ {{if comment}}
28	+ <table cellspacing="0" cellpadding="0" class="message-container">
29	+ <tr>
30	+ <td>{{var comment}}</td>
31	+ </tr>
32	+ </table>
33	+ {{/if}}
34	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
35	+ <p>
36	+ If you have any questions, please feel free to contact us at
37	+ <a href="mailto:{{var store_email}}">{{var store_email}}</a>
38	+ {{depend store_phone}} or by phone at <a href="tel:{{var phone}}">{{var store_phone}}</a>{{/depend}}.
39	+ </p>
40	+ </td>
41	+ </tr>
42	+ </table>
43	+ </td>
44	+ </tr>




45	</table>
46	+
47	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/creditmemo_update_guest.html CHANGED Viewed

@@ -11,41 +11,37 @@
             "var store.getFrontendName()":"Store Name"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                        <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{htmlescape var=$billing.getName()}},</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">
-            -
                                    Your order # {{var order.increment_id}} has been <br/>
-            -
                                    <strong>{{var order.getStatusLabel()}}</strong>.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">{{var comment}}</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    If you have any questions, please feel free to contact us at
-            -
                                    <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a>
-            -
                                    or by phone at {{config path='general/store_information/phone'}}.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


11	"var store.getFrontendName()":"Store Name"}
12	@-->
13	<!--@styles

14	@-->
15
16	+ {{template config_path="design/email/header"}}
17	+ {{inlinecss file="email-inline.css"}}
18	+
19	+ <table cellpadding="0" cellspacing="0" border="0">
20	+ <tr>
21	+ <td>
22	+ <table cellpadding="0" cellspacing="0" border="0">
23	+ <tr>
24	+ <td class="action-content">
25	+ <h1>{{htmlescape var=$billing.getName()}},</h1>
26	+ <p>Your order <span class="no-link">#{{var order.increment_id}}</span> has been updated to: <strong>{{var order.getStatusLabel()}}</strong></p>
27	+ {{if comment}}
28	+ <table cellspacing="0" cellpadding="0" class="message-container">
29	+ <tr>
30	+ <td>{{var comment}}</td>
31	+ </tr>
32	+ </table>
33	+ {{/if}}
34	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
35	+ <p>
36	+ If you have any questions, please feel free to contact us at
37	+ <a href="mailto:{{var store_email}}">{{var store_email}}</a>
38	+ {{depend store_phone}} or by phone at <a href="tel:{{var phone}}">{{var store_phone}}</a>{{/depend}}.
39	+ </p>
40	+ </td>
41	+ </tr>
42	+ </table>
43	+ </td>
44	+ </tr>



45	</table>
46	+
47	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/invoice_new.html CHANGED Viewed

@@ -16,92 +16,84 @@
             "var comment":"Invoice Comment"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                    <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    Thank you for your order from {{var store.getFrontendName()}}.
-            -
                                    You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.
-            -
                                    If you have any questions about your order please contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or call us at <span class="nobr">{{config path='general/store_information/phone'}}</span> Monday - Friday, 8am - 5pm PST.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <h2 style="font-size:18px; font-weight:normal; margin:0;">Your Invoice #{{var invoice.increment_id}} for Order #{{var order.increment_id}}</h2>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                        <tr>
-            -
                                            <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Billing Information:</th>
-            -
                                            <th width="10"></th>
-            -
                                            <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Payment Method:</th>
-            -
                                        </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.billing_address.format('html')}}
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var payment_html}}
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{depend order.getIsNotVirtual()}}
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="100%">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_address.format('html')}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_description}}&nbsp;
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{/depend}}
-            -
                                {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}}
-            -
                                <p style="font-size:12px; margin:0 10px 10px 0;">{{var comment}}</p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


16	"var comment":"Invoice Comment"}
17	@-->
18	<!--@styles

19	@-->
20
21	+
22	+ {{template config_path="design/email/header"}}
23	+ {{inlinecss file="email-inline.css"}}
24	+
25	+ <table cellpadding="0" cellspacing="0" border="0">
26	+ <tr>
27	+ <td>
28	+ <table cellpadding="0" cellspacing="0" border="0">
29	+ <tr>
30	+ <td class="email-heading">
31	+ <h1>Thank you for your order from {{var store.getFrontendName()}}.</h1>
32	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
33	+ </td>
34	+ <td class="store-info">
35	+ <h4>Order Questions?</h4>
36	+ <p>
37	+ {{depend store_phone}}
38	+ <b>Call Us:</b>
39	+ <a href="tel:{{var phone}}">{{var store_phone}}</a><br>
40	+ {{/depend}}
41	+ {{depend store_hours}}
42	+ <span class="no-link">{{var store_hours}}</span><br>
43	+ {{/depend}}
44	+ {{depend store_email}}
45	+ <b>Email:</b> <a href="mailto:{{var store_email}}">{{var store_email}}</a>
46	+ {{/depend}}
47	+ </p>
48	+ </td>
49	+ </tr>
50	+ </table>
51	+ </td>
52	+ </tr>
53	+ <tr>
54	+ <td class="order-details">
55	+ <h3>Your Invoice <span class="no-link">#{{var invoice.increment_id}}</span></h3>
56	+ <p>Order <span class="no-link">#{{var order.increment_id}}</span></p>
57	+ </td>
58	+ </tr>
59	+ <tr class="order-information">
60	+ <td>
61	+ {{if comment}}
62	+ <table cellspacing="0" cellpadding="0" class="message-container">
63	+ <tr>
64	+ <td>{{var comment}}</td>
65	+ </tr>
66	+ </table>
67	+ {{/if}}
68	+ {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}}
69	+ <table cellpadding="0" cellspacing="0" border="0">
70	+ <tr>
71	+ <td class="address-details">
72	+ <h6>Bill to:</h6>
73	+ <p><span class="no-link">{{var order.billing_address.format('html')}}</span></p>
74	+ </td>
75	{{depend order.getIsNotVirtual()}}
76	+ <td class="address-details">
77	+ <h6>Ship to:</h6>
78	+ <p><span class="no-link">{{var order.shipping_address.format('html')}}</span></p>
79	+ </td>


















80	{{/depend}}
81	+ </tr>
82	+ <tr>
83	+ {{depend order.getIsNotVirtual()}}
84	+ <td class="method-info">
85	+ <h6>Shipping method:</h6>
86	+ <p>{{var order.shipping_description}}</p>
87	+ </td>
88	+ {{/depend}}
89	+ <td class="method-info">
90	+ <h6>Payment method:</h6>
91	+ {{var payment_html}}
92	+ </td>
93	+ </tr>
94	+ </table>
95	+ </td>
96	+ </tr>
97	</table>
98	+
99	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/invoice_new_guest.html CHANGED Viewed

@@ -3,104 +3,97 @@
             {"store url=\"\"":"Store Url",
             "var logo_url":"Email Logo Image Url",
             "var logo_alt":"Email Logo Image Alt",
-            -
            "htmlescape var=$billing.getName()":"Guest Customer Name",
             "var store.getFrontendName()":"Store Name",
             "var invoice.increment_id":"Invoice Id",
             "var order.increment_id":"Order Id",
             "var order.billing_address.format('html')":"Billing Address",
             "var payment_html":"Payment Details",
             "var order.shipping_address.format('html')":"Shipping Address",
             "var order.shipping_description":"Shipping Description",
-            -
            "layout handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
             "var comment":"Invoice Comment"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                    <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$billing.getName()}}</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    Thank you for your order from {{var store.getFrontendName()}}.
-            -
                                    If you have any questions about your order please contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or call us at <span class="nobr">{{config path='general/store_information/phone'}}</span> Monday - Friday, 8am - 5pm PST.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <h2 style="font-size:18px; font-weight:normal; margin:0;">Your Invoice #{{var invoice.increment_id}} for Order #{{var order.increment_id}}</h2>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Billing Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Payment Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.billing_address.format('html')}}
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var payment_html}}
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{depend order.getIsNotVirtual()}}
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="650" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="650" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_address.format('html')}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_description}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{/depend}}
-            -
                                {{layout handle="sales_email_order_invoice_items" invoice=$invoice order=$order}}
-            -
                                <p style="font-size:12px; margin:0 0 10px 0">{{var comment}}</p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


3	{"store url=\"\"":"Store Url",
4	"var logo_url":"Email Logo Image Url",
5	"var logo_alt":"Email Logo Image Alt",
6	+ "htmlescape var=$order.getCustomerName()":"Customer Name",
7	"var store.getFrontendName()":"Store Name",
8	+ "store url=\"customer/account/\"":"Customer Account Url",
9	"var invoice.increment_id":"Invoice Id",
10	"var order.increment_id":"Order Id",
11	"var order.billing_address.format('html')":"Billing Address",
12	"var payment_html":"Payment Details",
13	"var order.shipping_address.format('html')":"Shipping Address",
14	"var order.shipping_description":"Shipping Description",
15	+ "layout area=\"frontend\" handle=\"sales_email_order_invoice_items\" invoice=$invoice order=$order":"Invoice Items Grid",
16	"var comment":"Invoice Comment"}
17	@-->
18	<!--@styles

19	@-->
20
21	+
22	+ {{template config_path="design/email/header"}}
23	+ {{inlinecss file="email-inline.css"}}
24	+
25	+ <table cellpadding="0" cellspacing="0" border="0">
26	+ <tr>
27	+ <td>
28	+ <table cellpadding="0" cellspacing="0" border="0">
29	+ <tr>
30	+ <td class="email-heading">
31	+ <h1>Thank you for your order from {{var store.getFrontendName()}}.</h1>
32	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
33	+ </td>
34	+ <td class="store-info">
35	+ <h4>Order Questions?</h4>
36	+ <p>
37	+ {{depend store_phone}}
38	+ <b>Call Us:</b>
39	+ <a href="tel:{{var phone}}">{{var store_phone}}</a><br>
40	+ {{/depend}}
41	+ {{depend store_hours}}
42	+ <span class="no-link">{{var store_hours}}</span><br>
43	+ {{/depend}}
44	+ {{depend store_email}}
45	+ <b>Email:</b> <a href="mailto:{{var store_email}}">{{var store_email}}</a>
46	+ {{/depend}}
47	+ </p>
48	+ </td>
49	+ </tr>
50	+ </table>
51	+ </td>
52	+ </tr>
53	+ <tr>
54	+ <td class="order-details">
55	+ <h3>Your Invoice <span class="no-link">#{{var invoice.increment_id}}</span></h3>
56	+ <p>Order <span class="no-link">#{{var order.increment_id}}</span></p>
57	+ </td>
58	+ </tr>
59	+ <tr class="order-information">
60	+ <td>
61	+ {{if comment}}
62	+ <table cellspacing="0" cellpadding="0" class="message-container">
63	+ <tr>
64	+ <td>{{var comment}}</td>
65	+ </tr>
66	+ </table>
67	+ {{/if}}
68	+ {{layout area="frontend" handle="sales_email_order_invoice_items" invoice=$invoice order=$order}}
69	+ <table cellpadding="0" cellspacing="0" border="0">
70	+ <tr>
71	+ <td class="address-details">
72	+ <h6>Bill to:</h6>
73	+ <p><span class="no-link">{{var order.billing_address.format('html')}}</span></p>
74	+ </td>
75	{{depend order.getIsNotVirtual()}}
76	+ <td class="address-details">
77	+ <h6>Ship to:</h6>
78	+ <p><span class="no-link">{{var order.shipping_address.format('html')}}</span></p>
79	+ </td>



















80	{{/depend}}
81	+ </tr>
82	+ <tr>
83	+ {{depend order.getIsNotVirtual()}}
84	+ <td class="method-info">
85	+ <h6>Shipping method:</h6>
86	+ <p>{{var order.shipping_description}}</p>
87	+ </td>
88	+ {{/depend}}
89	+ <td class="method-info">
90	+ <h6>Payment method:</h6>
91	+ {{var payment_html}}
92	+ </td>
93	+ </tr>
94	+ </table>
95	+ </td>
96	+ </tr>
97	</table>
98	+
99	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/invoice_update.html CHANGED Viewed

@@ -11,42 +11,38 @@
             "var store.getFrontendName()":"Store Name"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                        <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{htmlescape var=$order.getCustomerName()}},</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">
-            -
                                    Your order # {{var order.increment_id}} has been <br/>
-            -
                                    <strong>{{var order.getStatusLabel()}}</strong>.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">{{var comment}}</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    If you have any questions, please feel free to contact us at
-            -
                                    <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a>
-            -
                                    or by phone at {{config path='general/store_information/phone'}}.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


11	"var store.getFrontendName()":"Store Name"}
12	@-->
13	<!--@styles

14	@-->
15
16	+
17	+ {{template config_path="design/email/header"}}
18	+ {{inlinecss file="email-inline.css"}}
19	+
20	+ <table cellpadding="0" cellspacing="0" border="0">
21	+ <tr>
22	+ <td>
23	+ <table cellpadding="0" cellspacing="0" border="0">
24	+ <tr>
25	+ <td class="action-content">
26	+ <h1>{{htmlescape var=$order.getCustomerName()}},</h1>
27	+ <p>Your order <span class="no-link">#{{var order.increment_id}}</span> has been updated to: <strong>{{var order.getStatusLabel()}}</strong></p>
28	+ {{if comment}}
29	+ <table cellspacing="0" cellpadding="0" class="message-container">
30	+ <tr>
31	+ <td>{{var comment}}</td>
32	+ </tr>
33	+ </table>
34	+ {{/if}}
35	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
36	+ <p>
37	+ If you have any questions, please feel free to contact us at
38	+ <a href="mailto:{{var store_email}}">{{var store_email}}</a>
39	+ {{depend store_phone}} or by phone at <a href="tel:{{var phone}}">{{var store_phone}}</a>{{/depend}}.
40	+ </p>
41	+ </td>
42	+ </tr>
43	+ </table>
44	+ </td>
45	+ </tr>



46	</table>
47	+
48	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/invoice_update_guest.html CHANGED Viewed

@@ -10,40 +10,37 @@
             "var store.getFrontendName()":"Store Name"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                        <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{htmlescape var=$billing.getName()}},</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">
-            -
                                    Your order # {{var order.increment_id}} has been <br/>
-            -
                                    <strong>{{var order.getStatusLabel()}}</strong>.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">{{var comment}}</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    If you have any questions, please feel free to contact us at
-            -
                                    <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a>
-            -
                                    or by phone at {{config path='general/store_information/phone'}}.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>


10	"var store.getFrontendName()":"Store 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>
21	+ <table cellpadding="0" cellspacing="0" border="0">
22	+ <tr>
23	+ <td class="action-content">
24	+ <h1>{{htmlescape var=$billing.getName()}},</h1>
25	+ <p>Your order <span class="no-link">#{{var order.increment_id}}</span> has been updated to: <strong>{{var order.getStatusLabel()}}</strong></p>
26	+ {{if comment}}
27	+ <table cellspacing="0" cellpadding="0" class="message-container">
28	+ <tr>
29	+ <td>{{var comment}}</td>
30	+ </tr>
31	+ </table>
32	+ {{/if}}
33	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
34	+ <p>
35	+ If you have any questions, please feel free to contact us at
36	+ <a href="mailto:{{var store_email}}">{{var store_email}}</a>
37	+ {{depend store_phone}} or by phone at <a href="tel:{{var phone}}">{{var store_phone}}</a>{{/depend}}.
38	+ </p>
39	+ </td>
40	+ </tr>
41	+ </table>
42	+ </td>
43	+ </tr>



44	</table>
45	+
46	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/order_new.html CHANGED Viewed

@@ -16,94 +16,83 @@
             "var order.getEmailCustomerNote()":"Email Order Note"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <!-- [ header starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                        <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    Thank you for your order from {{var store.getFrontendName()}}.
-            -
                                    Once your package ships we will send an email with a link to track your order.
-            -
                                    You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.
-            -
                                    If you have any questions about your order please contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or call us at <span class="nobr">{{config path='general/store_information/phone'}}</span> Monday - Friday, 8am - 5pm PST.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">Your order confirmation is below. Thank you again for your business.</p>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <h2 style="font-size:18px; font-weight:normal; margin:0;">Your Order #{{var order.increment_id}} <small>(placed on {{var order.getCreatedAtFormated('long')}})</small></h2>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Billing Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Payment Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.getBillingAddress().format('html')}}
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var payment_html}}
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{depend order.getIsNotVirtual()}}
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.getShippingAddress().format('html')}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.getShippingDescription()}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{/depend}}
-            -
                                {{layout handle="sales_email_order_items" order=$order}}
-            -
                                <p style="font-size:12px; margin:0 0 10px 0">{{var order.getEmailCustomerNote()}}</p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


16	"var order.getEmailCustomerNote()":"Email Order Note"}
17	@-->
18	<!--@styles

19	@-->
20
21	+ {{template config_path="design/email/header"}}
22	+ {{inlinecss file="email-inline.css"}}
23	+
24	+ <table cellpadding="0" cellspacing="0" border="0">
25	+ <tr>
26	+ <td>
27	+ <table cellpadding="0" cellspacing="0" border="0">
28	+ <tr>
29	+ <td class="email-heading">
30	+ <h1>Thank you for your order from {{var store.getFrontendName()}}.</h1>
31	+ <p>Once your package ships we will send an email with a link to track your order. Your order summary is below. Thank you again for your business.</p>
32	+ </td>
33	+ <td class="store-info">
34	+ <h4>Order Questions?</h4>
35	+ <p>
36	+ {{depend store_phone}}
37	+ <b>Call Us:</b>
38	+ <a href="tel:{{var phone}}">{{var store_phone}}</a><br>
39	+ {{/depend}}
40	+ {{depend store_hours}}
41	+ <span class="no-link">{{var store_hours}}</span><br>
42	+ {{/depend}}
43	+ {{depend store_email}}
44	+ <b>Email:</b> <a href="mailto:{{var store_email}}">{{var store_email}}</a>
45	+ {{/depend}}
46	+ </p>
47	+ </td>
48	+ </tr>
49	+ </table>
50	+ </td>
51	+ </tr>
52	+ <tr>
53	+ <td class="order-details">
54	+ <h3>Your order <span class="no-link">#{{var order.increment_id}}</span></h3>
55	+ <p>Placed on {{var order.getCreatedAtFormated('long')}}</p>
56	+ </td>
57	+ </tr>
58	+ <tr class="order-information">
59	+ <td>
60	+ {{if order.getEmailCustomerNote()}}
61	+ <table cellspacing="0" cellpadding="0" class="message-container">
62	+ <tr>
63	+ <td>{{var order.getEmailCustomerNote()}}</td>
64	+ </tr>
65	+ </table>
66	+ {{/if}}
67	+ {{layout handle="sales_email_order_items" order=$order}}
68	+ <table cellpadding="0" cellspacing="0" border="0">
69	+ <tr>
70	+ <td class="address-details">
71	+ <h6>Bill to:</h6>
72	+ <p><span class="no-link">{{var order.getBillingAddress().format('html')}}</span></p>
73	+ </td>
74	+ {{depend order.getIsNotVirtual()}}
75	+ <td class="address-details">
76	+ <h6>Ship to:</h6>
77	+ <p><span class="no-link">{{var order.getShippingAddress().format('html')}}</span></p>
78	+ </td>
79	+ {{/depend}}
80	+ </tr>
81	+ <tr>
82	{{depend order.getIsNotVirtual()}}
83	+ <td class="method-info">
84	+ <h6>Shipping method:</h6>
85	+ <p>{{var order.shipping_description}}</p>
86	+ </td>



















87	{{/depend}}
88	+ <td class="method-info">
89	+ <h6>Payment method:</h6>
90	+ {{var payment_html}}
91	+ </td>
92	+ </tr>
93	+ </table>
94	+ </td>
95	+ </tr>


96	</table>
97	+
98	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/order_new_guest.html CHANGED Viewed

@@ -3,8 +3,9 @@
             {"store url=\"\"":"Store Url",
             "var logo_url":"Email Logo Image Url",
             "var logo_alt":"Email Logo Image Alt",
-            -
            "htmlescape var=$order.getBillingAddress().getName()":"Guest Customer Name",
             "var store.getFrontendName()":"Store Name",
             "var order.increment_id":"Order Id",
             "var order.getCreatedAtFormated('long')":"Order Created At (datetime)",
             "var order.getBillingAddress().format('html')":"Billing Address",
@@ -15,94 +16,83 @@
             "var order.getEmailCustomerNote()":"Email Order Note"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                    <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Hello, {{htmlescape var=$order.getBillingAddress().getName()}}</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">
-            -
                                    Thank you for your order from {{var store.getFrontendName()}}.
-            -
                                    Once your package ships we will send an email with a link to track your order.
-            -
                                    If you have any questions about your order please contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or call us at <span class="nobr">{{config path='general/store_information/phone'}}</span> Monday - Friday, 8am - 5pm PST.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">Your order confirmation is below. Thank you again for your business.</p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <h2 style="font-size:18px; font-weight:normal; margin:0;">Your Order #{{var order.increment_id}} <small>(placed on {{var order.getCreatedAtFormated('long')}})</small></h2>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Billing Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Payment Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.getBillingAddress().format('html')}}
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var payment_html}}
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{depend order.getIsNotVirtual()}}
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="100%">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.getShippingAddress().format('html')}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.getShippingDescription()}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
                                 {{/depend}}
-            -
                                {{layout handle="sales_email_order_items" order=$order}}
-            -
                                <p style="font-size:12px; margin:0 10px 10px 0">{{var order.getEmailCustomerNote()}}</p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


3	{"store url=\"\"":"Store Url",
4	"var logo_url":"Email Logo Image Url",
5	"var logo_alt":"Email Logo Image Alt",
6	+ "htmlescape var=$order.getCustomerName()":"Customer Name",
7	"var store.getFrontendName()":"Store Name",
8	+ "store url=\"customer/account/\"":"Customer Account Url",
9	"var order.increment_id":"Order Id",
10	"var order.getCreatedAtFormated('long')":"Order Created At (datetime)",
11	"var order.getBillingAddress().format('html')":"Billing Address",

16	"var order.getEmailCustomerNote()":"Email Order Note"}
17	@-->
18	<!--@styles

19	@-->
20
21	+ {{template config_path="design/email/header"}}
22	+ {{inlinecss file="email-inline.css"}}
23	+
24	+ <table cellpadding="0" cellspacing="0" border="0">
25	+ <tr>
26	+ <td>
27	+ <table cellpadding="0" cellspacing="0" border="0">
28	+ <tr>
29	+ <td class="email-heading">
30	+ <h1>Thank you for your order from {{var store.getFrontendName()}}.</h1>
31	+ <p>Once your package ships we will send an email with a link to track your order. Your order summary is below. Thank you again for your business.</p>
32	+ </td>
33	+ <td class="store-info">
34	+ <h4>Order Questions?</h4>
35	+ <p>
36	+ {{depend store_phone}}
37	+ <b>Call Us:</b>
38	+ <a href="tel:{{var phone}}">{{var store_phone}}</a><br>
39	+ {{/depend}}
40	+ {{depend store_hours}}
41	+ <span class="no-link">{{var store_hours}}</span><br>
42	+ {{/depend}}
43	+ {{depend store_email}}
44	+ <b>Email:</b> <a href="mailto:{{var store_email}}">{{var store_email}}</a>
45	+ {{/depend}}
46	+ </p>
47	+ </td>
48	+ </tr>
49	+ </table>
50	+ </td>
51	+ </tr>
52	+ <tr>
53	+ <td class="order-details">
54	+ <h3>Your order <span class="no-link">#{{var order.increment_id}}</span></h3>
55	+ <p>Placed on {{var order.getCreatedAtFormated('long')}}</p>
56	+ </td>
57	+ </tr>
58	+ <tr class="order-information">
59	+ <td>
60	+ {{if order.getEmailCustomerNote()}}
61	+ <table cellspacing="0" cellpadding="0" class="message-container">
62	+ <tr>
63	+ <td>{{var order.getEmailCustomerNote()}}</td>
64	+ </tr>
65	+ </table>
66	+ {{/if}}
67	+ {{layout handle="sales_email_order_items" order=$order}}
68	+ <table cellpadding="0" cellspacing="0" border="0">
69	+ <tr>
70	+ <td class="address-details">
71	+ <h6>Bill to:</h6>
72	+ <p><span class="no-link">{{var order.getBillingAddress().format('html')}}</span></p>
73	+ </td>
74	+ {{depend order.getIsNotVirtual()}}
75	+ <td class="address-details">
76	+ <h6>Ship to:</h6>
77	+ <p><span class="no-link">{{var order.getShippingAddress().format('html')}}</span></p>
78	+ </td>
79	+ {{/depend}}
80	+ </tr>
81	+ <tr>
82	{{depend order.getIsNotVirtual()}}
83	+ <td class="method-info">
84	+ <h6>Shipping method:</h6>
85	+ <p>{{var order.shipping_description}}</p>
86	+ </td>



















87	{{/depend}}
88	+ <td class="method-info">
89	+ <h6>Payment method:</h6>
90	+ {{var payment_html}}
91	+ </td>
92	+ </tr>
93	+ </table>
94	+ </td>
95	+ </tr>


96	</table>
97	+
98	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/order_update.html CHANGED Viewed

@@ -11,42 +11,37 @@
             "var store.getFrontendName()":"Store Name"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                        <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{htmlescape var=$order.getCustomerName()}},</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">
-            -
                                    Your order # {{var order.increment_id}} has been <br/>
-            -
                                    <strong>{{var order.getStatusLabel()}}</strong>.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">{{var comment}}</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    If you have any questions, please feel free to contact us at
-            -
                                    <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a>
-            -
                                    or by phone at {{config path='general/store_information/phone'}}.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


11	"var store.getFrontendName()":"Store Name"}
12	@-->
13	<!--@styles

14	@-->
15
16	+ {{template config_path="design/email/header"}}
17	+ {{inlinecss file="email-inline.css"}}
18	+
19	+ <table cellpadding="0" cellspacing="0" border="0">
20	+ <tr>
21	+ <td>
22	+ <table cellpadding="0" cellspacing="0" border="0">
23	+ <tr>
24	+ <td class="action-content">
25	+ <h1>{{htmlescape var=$order.getCustomerName()}},</h1>
26	+ <p>Your order <span class="no-link">#{{var order.increment_id}}</span> has been updated to: <strong>{{var order.getStatusLabel()}}</strong></p>
27	+ {{if comment}}
28	+ <table cellspacing="0" cellpadding="0" class="message-container">
29	+ <tr>
30	+ <td>{{var comment}}</td>
31	+ </tr>
32	+ </table>
33	+ {{/if}}
34	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
35	+ <p>
36	+ If you have any questions, please feel free to contact us at
37	+ <a href="mailto:{{var store_email}}">{{var store_email}}</a>
38	+ {{depend store_phone}} or by phone at <a href="tel:{{var phone}}">{{var store_phone}}</a>{{/depend}}.
39	+ </p>
40	+ </td>
41	+ </tr>
42	+ </table>
43	+ </td>
44	+ </tr>




45	</table>
46	+
47	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/order_update_guest.html CHANGED Viewed

@@ -10,41 +10,37 @@
             "var store.getFrontendName()":"Store Name"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                        <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{htmlescape var=$billing.getName()}},</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">
-            -
                                    Your order # {{var order.increment_id}} has been <br/>
-            -
                                    <strong>{{var order.getStatusLabel()}}</strong>.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">{{var comment}}</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    If you have any questions, please feel free to contact us at
-            -
                                    <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a>
-            -
                                    or by phone at {{config path='general/store_information/phone'}}.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


10	"var store.getFrontendName()":"Store 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>
21	+ <table cellpadding="0" cellspacing="0" border="0">
22	+ <tr>
23	+ <td class="action-content">
24	+ <h1>{{htmlescape var=$billing.getName()}},</h1>
25	+ <p>Your order <span class="no-link">#{{var order.increment_id}}</span> has been updated to: <strong>{{var order.getStatusLabel()}}</strong></p>
26	+ {{if comment}}
27	+ <table cellspacing="0" cellpadding="0" class="message-container">
28	+ <tr>
29	+ <td>{{var comment}}</td>
30	+ </tr>
31	+ </table>
32	+ {{/if}}
33	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
34	+ <p>
35	+ If you have any questions, please feel free to contact us at
36	+ <a href="mailto:{{var store_email}}">{{var store_email}}</a>
37	+ {{depend store_phone}} or by phone at <a href="tel:{{var phone}}">{{var store_phone}}</a>{{/depend}}.
38	+ </p>
39	+ </td>
40	+ </tr>
41	+ </table>
42	+ </td>
43	+ </tr>



44	</table>
45	+
46	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/shipment_new.html CHANGED Viewed

@@ -17,95 +17,84 @@
             "var comment":"Shipment Comment"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                    <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$order.getCustomerName()}}</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    Thank you for your order from {{var store.getFrontendName()}}.
-            -
                                    You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.
-            -
                                    If you have any questions about your order please contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or call us at <span class="nobr">{{config path='general/store_information/phone'}}</span> Monday - Friday, 8am - 5pm PST.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    Your shipping confirmation is below. Thank you again for your business.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <h2 style="font-size:18px; font-weight:normal; margin:0;">Your Shipment #{{var shipment.increment_id}} for Order #{{var order.increment_id}}</h2>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Billing Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Payment Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.billing_address.format('html')}}
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var payment_html}}
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="100%">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_address.format('html')}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_description}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
-            -
                                {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}}
-            -
                                {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}}
-            -
                                <p style="font-size:12px; margin:0 10px 10px 0">{{var comment}}</p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


17	"var comment":"Shipment Comment"}
18	@-->
19	<!--@styles

20	@-->
21
22	+ {{template config_path="design/email/header"}}
23	+ {{inlinecss file="email-inline.css"}}
24	+
25	+ <table cellpadding="0" cellspacing="0" border="0">
26	+ <tr>
27	+ <td>
28	+ <table cellpadding="0" cellspacing="0" border="0">
29	+ <tr>
30	+ <td class="email-heading">
31	+ <h1>Thank you for your order from {{var store.getFrontendName()}}.</h1>
32	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}"">logging into your account</a>.</p>
33	+ </td>
34	+ <td class="store-info">
35	+ <h4>Order Questions?</h4>
36	+ <p>
37	+ {{depend store_phone}}
38	+ <b>Call Us:</b>
39	+ <a href="tel:{{var phone}}">{{var store_phone}}</a><br>
40	+ {{/depend}}
41	+ {{depend store_hours}}
42	+ <span class="no-link">{{var store_hours}}</span><br>
43	+ {{/depend}}
44	+ {{depend store_email}}
45	+ <b>Email:</b> <a href="mailto:{{var store_email}}">{{var store_email}}</a>
46	+ {{/depend}}
47	+ </p>
48	+ </td>
49	+ </tr>
50	+ </table>
51	+ </td>
52	+ </tr>
53	+ <tr>
54	+ <td class="order-details">
55	+ <h3>Your Shipment <span class="no-link">#{{var shipment.increment_id}}</span></h3>
56	+ <p>Order <span class="no-link">#{{var order.increment_id}}</span></p>
57	+ </td>
58	+ </tr>
59	+ <tr class="order-information">
60	+ <td>
61	+ {{if comment}}
62	+ <table cellspacing="0" cellpadding="0" class="message-container">
63	+ <tr>
64	+ <td>{{var comment}}</td>
65	+ </tr>
66	+ </table>
67	+ {{/if}}
68	+ {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}}
69	+ <table cellpadding="0" cellspacing="0" border="0">
70	+ <tr>
71	+ <td class="address-details">
72	+ <h6>Bill to:</h6>
73	+ <p><span class="no-link">{{var order.billing_address.format('html')}}</span></p>
74	+ </td>
75	+ {{depend order.getIsNotVirtual()}}
76	+ <td class="address-details">
77	+ <h6>Ship to:</h6>
78	+ <p><span class="no-link">{{var order.shipping_address.format('html')}}</span></p>
79	+ </td>
80	+ {{/depend}}
81	+ </tr>
82	+ <tr>
83	+ {{depend order.getIsNotVirtual()}}
84	+ <td class="method-info">
85	+ <h6>Shipping method:</h6>
86	+ <p>{{var order.shipping_description}}</p>
87	+ </td>
88	+ {{/depend}}
89	+ <td class="method-info">
90	+ <h6>Payment method:</h6>
91	+ {{var payment_html}}
92	+ </td>
93	+ </tr>
94	+ </table>
95	+ {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}}
96	+ </td>
97	+ </tr>










98	</table>
99	+
100	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/shipment_new_guest.html CHANGED Viewed

@@ -16,94 +16,84 @@
             "var comment":"Shipment Comment"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                    <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;"">Hello, {{htmlescape var=$billing.getName()}}</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    Thank you for your order from {{var store.getFrontendName()}}.
-            -
                                    If you have any questions about your order please contact us at <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a> or call us at <span class="nobr">{{config path='general/store_information/phone'}}</span> Monday - Friday, 8am - 5pm PST.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    Your shipping confirmation is below. Thank you again for your business.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <h2 style="font-size:18px; font-weight:normal; margin:0;">Your Shipment #{{var shipment.increment_id}} for Order #{{var order.increment_id}}</h2>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td>
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="650">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Billing Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Payment Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.billing_address.format('html')}}
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var payment_html}}
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
-            -
                                <table cellspacing="0" cellpadding="0" border="0" width="100%">
-            -
                                    <thead>
-            -
                                    <tr>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Information:</th>
-            -
                                        <th width="10"></th>
-            -
                                        <th align="left" width="325" bgcolor="#EAEAEA" style="font-size:13px; padding:5px 9px 6px 9px; line-height:1em;">Shipping Method:</th>
-            -
                                    </tr>
-            -
                                    </thead>
-            -
                                    <tbody>
-            -
                                    <tr>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_address.format('html')}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                        <td>&nbsp;</td>
-            -
                                        <td valign="top" style="font-size:12px; padding:7px 9px 9px 9px; border-left:1px solid #EAEAEA; border-bottom:1px solid #EAEAEA; border-right:1px solid #EAEAEA;">
-            -
                                            {{var order.shipping_description}}
-            -
                                            &nbsp;
-            -
                                        </td>
-            -
                                    </tr>
-            -
                                    </tbody>
-            -
                                </table>
-            -
                                <br/>
-            -
                                {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}}
-            -
                                {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}}
-            -
                                <p style="font-size:12px; margin:0 10px 10px 0">{{var comment}}</p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


16	"var comment":"Shipment Comment"}
17	@-->
18	<!--@styles

19	@-->
20
21	+ {{template config_path="design/email/header"}}
22	+ {{inlinecss file="email-inline.css"}}
23	+
24	+ <table cellpadding="0" cellspacing="0" border="0">
25	+ <tr>
26	+ <td>
27	+ <table cellpadding="0" cellspacing="0" border="0">
28	+ <tr>
29	+ <td class="email-heading">
30	+ <h1>Thank you for your order from {{var store.getFrontendName()}}.</h1>
31	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}"">logging into your account</a>.</p>
32	+ </td>
33	+ <td class="store-info">
34	+ <h4>Order Questions?</h4>
35	+ <p>
36	+ {{depend store_phone}}
37	+ <b>Call Us:</b>
38	+ <a href="tel:{{var phone}}">{{var store_phone}}</a><br>
39	+ {{/depend}}
40	+ {{depend store_hours}}
41	+ <span class="no-link">{{var store_hours}}</span><br>
42	+ {{/depend}}
43	+ {{depend store_email}}
44	+ <b>Email:</b> <a href="mailto:{{var store_email}}">{{var store_email}}</a>
45	+ {{/depend}}
46	+ </p>
47	+ </td>
48	+ </tr>
49	+ </table>
50	+ </td>
51	+ </tr>
52	+ <tr>
53	+ <td class="order-details">
54	+ <h3>Your Shipment <span class="no-link">#{{var shipment.increment_id}}</span></h3>
55	+ <p>Order <span class="no-link">#{{var order.increment_id}}</span></p>
56	+ </td>
57	+ </tr>
58	+ <tr class="order-information">
59	+ <td>
60	+ {{if comment}}
61	+ <table cellspacing="0" cellpadding="0" class="message-container">
62	+ <tr>
63	+ <td>{{var comment}}</td>
64	+ </tr>
65	+ </table>
66	+ {{/if}}
67	+ {{layout handle="sales_email_order_shipment_items" shipment=$shipment order=$order}}
68	+ <table cellpadding="0" cellspacing="0" border="0">
69	+ <tr>
70	+ <td class="address-details">
71	+ <h6>Bill to:</h6>
72	+ <p><span class="no-link">{{var order.billing_address.format('html')}}</span></p>
73	+ </td>
74	+ {{depend order.getIsNotVirtual()}}
75	+ <td class="address-details">
76	+ <h6>Ship to:</h6>
77	+ <p><span class="no-link">{{var order.shipping_address.format('html')}}</span></p>
78	+ </td>
79	+ {{/depend}}
80	+ </tr>
81	+ <tr>
82	+ {{depend order.getIsNotVirtual()}}
83	+ <td class="method-info">
84	+ <h6>Shipping method:</h6>
85	+ <p>{{var order.shipping_description}}</p>
86	+ </td>
87	+ {{/depend}}
88	+ <td class="method-info">
89	+ <h6>Payment method:</h6>
90	+ {{var payment_html}}
91	+ </td>
92	+ </tr>
93	+ </table>
94	+ {{block type='core/template' area='frontend' template='email/order/shipment/track.phtml' shipment=$shipment order=$order}}
95	+ </td>
96	+ </tr>









97	</table>
98	+
99	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/shipment_update.html CHANGED Viewed

@@ -11,42 +11,38 @@
             "var store.getFrontendName()":"Store Name"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                        <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{htmlescape var=$order.getCustomerName()}},</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">
-            -
                                    Your order # {{var order.increment_id}} has been <br/>
-            -
                                    <strong>{{var order.getStatusLabel()}}</strong>.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">You can check the status of your order by <a href="{{store url="customer/account/"}}" style="color:#1E7EC8;">logging into your account</a>.</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">{{var comment}}</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    If you have any questions, please feel free to contact us at
-            -
                                    <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a>
-            -
                                    or by phone at {{config path='general/store_information/phone'}}.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


11	"var store.getFrontendName()":"Store Name"}
12	@-->
13	<!--@styles

14	@-->
15
16	+ {{template config_path="design/email/header"}}
17	+ {{inlinecss file="email-inline.css"}}
18	+
19	+
20	+ <table cellpadding="0" cellspacing="0" border="0">
21	+ <tr>
22	+ <td>
23	+ <table cellpadding="0" cellspacing="0" border="0">
24	+ <tr>
25	+ <td class="action-content">
26	+ <h1>{{htmlescape var=$order.getCustomerName()}},</h1>
27	+ <p>Your order <span class="no-link">#{{var order.increment_id}}</span> has been updated to: <strong>{{var order.getStatusLabel()}}</strong></p>
28	+ {{if comment}}
29	+ <table cellspacing="0" cellpadding="0" class="message-container">
30	+ <tr>
31	+ <td>{{var comment}}</td>
32	+ </tr>
33	+ </table>
34	+ {{/if}}
35	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
36	+ <p>
37	+ If you have any questions, please feel free to contact us at
38	+ <a href="mailto:{{var store_email}}">{{var store_email}}</a>
39	+ {{depend store_phone}} or by phone at <a href="tel:{{var phone}}">{{var store_phone}}</a>{{/depend}}.
40	+ </p>
41	+ </td>
42	+ </tr>
43	+ </table>
44	+ </td>
45	+ </tr>



46	</table>
47	+
48	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sales/shipment_update_guest.html CHANGED Viewed

@@ -10,41 +10,37 @@
             "var store.getFrontendName()":"Store Name"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
-            -
            <tr>
-            -
                <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                    <!-- [ header starts here] -->
-            -
                    <table bgcolor="#FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                        <tr>
-            -
                            <td valign="top"><a href="{{store url=""}}"><img src="{{var logo_url}}" alt="{{var logo_alt}}" style="margin-bottom:10px;" border="0"/></a></td>
-            -
                        </tr>
-            -
                        <!-- [ middle starts here] -->
-            -
                        <tr>
-            -
                            <td valign="top">
-            -
                                <h1 style="font-size:22px; font-weight:normal; line-height:22px; margin:0 0 11px 0;">Dear {{htmlescape var=$billing.getName()}},</h1>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">
-            -
                                    Your order # {{var order.increment_id}} has been <br/>
-            -
                                    <strong>{{var order.getStatusLabel()}}</strong>.
-            -
                                </p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0 0 10px 0;">{{var comment}}</p>
-            -
                                <p style="font-size:12px; line-height:16px; margin:0;">
-            -
                                    If you have any questions, please feel free to contact us at
-            -
                                    <a href="mailto:{{config path='trans_email/ident_support/email'}}" style="color:#1E7EC8;">{{config path='trans_email/ident_support/email'}}</a>
-            -
                                    or by phone at {{config path='general/store_information/phone'}}.
-            -
                                </p>
-            -
                            </td>
-            -
                        </tr>
-            -
                        <tr>
-            -
                            <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you again, <strong>{{var store.getFrontendName()}}</strong></p></center></td>
-            -
                        </tr>
-            -
                    </table>
-            -
                </td>
-            -
            </tr>
             </table>
-            -
            </div>
-            -
            </body>


10	"var store.getFrontendName()":"Store 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>
21	+ <table cellpadding="0" cellspacing="0" border="0">
22	+ <tr>
23	+ <td class="action-content">
24	+ <h1>{{htmlescape var=$billing.getName()}},</h1>
25	+ <p>Your order <span class="no-link">#{{var order.increment_id}}</span> has been updated to: <strong>{{var order.getStatusLabel()}}</strong></p>
26	+ {{if comment}}
27	+ <table cellspacing="0" cellpadding="0" class="message-container">
28	+ <tr>
29	+ <td>{{var comment}}</td>
30	+ </tr>
31	+ </table>
32	+ {{/if}}
33	+ <p>You can check the status of your order by <a href="{{store url="customer/account/"}}">logging into your account</a>.</p>
34	+ <p>
35	+ If you have any questions, please feel free to contact us at
36	+ <a href="mailto:{{var store_email}}">{{var store_email}}</a>
37	+ {{depend store_phone}} or by phone at <a href="tel:{{var phone}}">{{var store_phone}}</a>{{/depend}}.
38	+ </p>
39	+ </td>
40	+ </tr>
41	+ </table>
42	+ </td>
43	+ </tr>



44	</table>
45	+
46	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/sitemap_generate_warning.html CHANGED Viewed

	@@ -2,7 +2,6 @@
2	<!--@vars
3	{"var warnings":"Sitemap Generate Warnings"}
4	@-->
5	- Sitemap generate warnings:
6	-
7

8	{{var warnings}}


2	<!--@vars
3	{"var warnings":"Sitemap Generate Warnings"}
4	@-->


5
6	+ Sitemap generate warnings:
7	{{var warnings}}

app/locale/en_US/template/email/token.html CHANGED Viewed

@@ -4,6 +4,16 @@
             "var $applicationName":"Application name",
             "var $status":"Token new status"}
             @-->
-            -
            Hello, {{htmlescape var=$userName}}<br /><br />
-            -
            Your authorization to <b>{{htmlescape var=$applicationName}}</b> has been changed to <b>{{htmlescape var=$status}}</b> by Admin team.<br /><br />


4	"var $applicationName":"Application name",
5	"var $status":"Token new status"}
6	@-->
7	+ {{template config_path="design/email/header"}}
8	+ {{inlinecss file="email-inline.css"}}
9
10	+ <table cellpadding="0" cellspacing="0" border="0">
11	+ <tr>
12	+ <td class="action-content">
13	+ <h1>Hello, {{htmlescape var=$userName}}</h1>
14	+ <p>Your authorization to <b>{{htmlescape var=$applicationName}}</b> has been changed to <b>{{htmlescape var=$status}}</b> by Admin team.</p>
15	+ </td>
16	+ </tr>
17	+ </table>
18	+
19	+ {{template config_path="design/email/footer"}}

app/locale/en_US/template/email/wishlist_share.html CHANGED Viewed

@@ -7,37 +7,33 @@
             "var items":"Wishlist Items"}
             @-->
             <!--@styles
-            -
            body,td { color:#2f2f2f; font:11px/1.35em Verdana, Arial, Helvetica, sans-serif; }
             @-->
-            -
            <body style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <div style="background:#F6F6F6; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:0; padding:0;">
-            -
            <table cellspacing="0" cellpadding="0" border="0" height="100%" width="100%">
                 <tr>
-            -
                    <td align="center" valign="top" style="padding:20px 0 20px 0">
-            -
                        <!-- [ header starts here] -->
-            -
                        <table bgcolor="FFFFFF" cellspacing="0" cellpadding="10" border="0" width="650" style="border:1px solid #E0E0E0;">
-            -
                            <tr>
-            -
                                <td valign="top">
-            -
                                    <a href="{{store url=""}}" style="color:#1E7EC8;"><img src="{{var logo_url}}" alt="{{var logo_alt}}" border="0"/></a>
-            -
                                </td>
-            -
                            </tr>
-            -
                            <!-- [ middle starts here] -->
                             <tr>
-            -
                                <td valign="top">
-            -
                                    <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">Hey,<br/>Take a look at my wishlist from {{var store.getFrontendName()}}.</p>
-            -
                                    <p style="font-size:12px; line-height:16px; margin:0 0 16px 0;">{{var message}}</p>
                                     {{var items}}
-            -
                                    <br/>
-            -
                                    {{depend salable}}<p style="font-size:12px; line-height:16px; margin:0 0 8px 0;"><strong><a href="{{var addAllLink}}" style="color:#1E7EC8;">Add all items to shopping cart</a></strong> |{{/depend}} <strong><a href="{{var viewOnSiteLink}}" style="color:#1E7EC8;">View all wishlist items</a></strong></p>
                                 </td>
                             </tr>
-            -
                            <tr>
-            -
                                <td bgcolor="#EAEAEA" align="center" style="background:#EAEAEA; text-align:center;"><center><p style="font-size:12px; margin:0;">Thank you, <strong>{{htmlescape var=$customer.name}}</p></center></td>
-            -
                            </td>
                         </table>
                     </td>
                 </tr>
             </table>
-            -
            </div>
-            -
            </body>


7	"var items":"Wishlist Items"}
8	@-->
9	<!--@styles

10	@-->
11
12	+ {{template config_path="design/email/header"}}
13	+ {{inlinecss file="email-inline.css"}}
14	+
15	+ <table cellpadding="0" cellspacing="0" border="0">
16	<tr>
17	+ <td>
18	+ <table cellpadding="0" cellspacing="0" border="0">







19	<tr>
20	+ <td class="action-content">
21	+ <h1>Hey, take a look at my wishlist from {{var store.getFrontendName()}}.</h1>
22	+ <table cellspacing="0" cellpadding="0" class="message-container">
23	+ <tr>
24	+ <td>{{var message}}</td>
25	+ </tr>
26	+ </table>
27	{{var items}}
28	+ {{depend salable}}
29	+ <p><strong><a href="{{var addAllLink}}">Add all items to shopping cart</a></strong> \|
30	+ {{/depend}}
31	+ <strong><a href="{{var viewOnSiteLink}}">View all wishlist items</a></strong></p>
32	</td>
33	</tr>



34	</table>
35	</td>
36	</tr>
37	</table>
38	+
39	+ {{template config_path="design/email/footer"}}

package.xml CHANGED Viewed

	@@ -1,18 +1,18 @@
1	<?xml version="1.0"?>
2	<package>
3	<name>Mage_Locale_en_US</name>
4	- <version>1.9.0.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.0.0</notes>
12	<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13	- <date>2014-05~~-07~~</date>
14	- <time>14:07:31</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="~~a34aed43b6ffe5c805d392df8ae53a0e~~"/><file name="Mage_Captcha.csv" hash="de6aef08396245ed644b213ecfcf309b"/><file name="Mage_Catalog.csv" hash="~~25210b752ed984b766874374b4bfe8cd~~"/><file name="Mage_CatalogInventory.csv" hash="~~969014c8d71762ac5b9ed41c08412258~~"/><file name="Mage_CatalogRule.csv" hash="~~c7dcdd7d6192fbbbee177aaeb56b1685~~"/><file name="Mage_CatalogSearch.csv" hash="9d822bca8067087dabe1d213193a2def"/><file name="Mage_Checkout.csv" hash="~~5ac4f75eff508b6a97bfc4304c2078b9~~"/><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="~~22868544aa8162565b242f50f63f4070~~"/><file name="Mage_Cron.csv" hash="~~f963e0b41f877519fd8f6e723f25ee3c~~"/><file name="Mage_CurrencySymbol.csv" hash="2cc13530e2f9387349c6a162d4d22bc9"/><file name="Mage_Customer.csv" hash="~~89d871896e773189e2c37b1e37f4a88f~~"/><file name="Mage_Dataflow.csv" hash="02ddb4090005e6678f020ac96c2cbe81"/><file name="Mage_Directory.csv" hash="~~0bafe29aec20640b445050d77dd4c645~~"/><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="~~d1f4b46dc60430db2fd50c4c0a8a309d~~"/><file name="Mage_PageCache.csv" hash="~~365e8f2f9dace7313711e9a27d27cd97~~"/><file name="Mage_Paygate.csv" hash="~~57261c4f5c3882da1f89d3d48e349ab9~~"/><file name="Mage_Payment.csv" hash="~~462c65c2c7830f073b8901a870f42818~~"/><file name="Mage_Paypal.csv" hash="~~8ab7efa897b3ad12f0b940c083029fc5~~"/><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="~~a6a968b628d92b7f172801ce05755962~~"/><file name="Mage_Sales.csv" hash="~~619a6f1720216ff4471d816608776fcb~~"/><file name="Mage_SalesRule.csv" hash="~~9e6fbd2421b33de74d74fa9b4b8ede6b~~"/><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="211c99ac80a4b4e02b40a9907a4bc89a"/><file name="Mage_Tax.csv" hash="~~f5ec0e9f02d679d3600baf481a27b406~~"/><file name="Mage_Usa.csv" hash="~~be5f5542aedcc287996ec9261b6a18f0~~"/><file name="Mage_Weee.csv" hash="~~61d60384646bfd244a58a1bc6447f300~~"/><file name="Mage_Widget.csv" hash="70a76519c347dd8f4209cb3dac849fe6"/><file name="Mage_Wishlist.csv" hash="~~50aa10b3d5056677eadb7b3fbae994c0~~"/><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>


1	<?xml version="1.0"?>
2	<package>
3	<name>Mage_Locale_en_US</name>
4	+ <version>1.9.1.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.1.0</notes>
12	<authors><author><name>Magento Core Team</name><user>core</user><email>core@magentocommerce.com</email></author></authors>
13	+ <date>2014-11-05</date>
14	+ <time>08:43:01</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="33907366291774aa21af7f3347a33e60"/><file name="Mage_CatalogInventory.csv" hash="2a9f7baf79c8d7c2edb8799bcf8043bb"/><file name="Mage_CatalogRule.csv" hash="7b7d6ad17c61efa14ade33c0fb443d36"/><file name="Mage_CatalogSearch.csv" hash="9d822bca8067087dabe1d213193a2def"/><file name="Mage_Checkout.csv" hash="fdee000d91637e94cbe3ba56cf0bf412"/><file name="Mage_Cms.csv" hash="9a538e344acce7afa686fbed65082c63"/><file name="Mage_ConfigurableSwatches.csv" hash="71828b79d27c1a3924cbb65b823830e1"/><file name="Mage_Connect.csv" hash="8cd1b22e3bb2b18a59b6bfb6a7e4e7f9"/><file name="Mage_Contacts.csv" hash="7e367e9a924c19b6df2fa5c8adca9be4"/><file name="Mage_Core.csv" hash="af8b9ea5c5ecc887d51b5f7d9132812d"/><file name="Mage_Cron.csv" hash="e5803e0da7c568134db4864b8eb55f22"/><file name="Mage_CurrencySymbol.csv" hash="2cc13530e2f9387349c6a162d4d22bc9"/><file name="Mage_Customer.csv" hash="1a113faad0574772263da98eb696f3f7"/><file name="Mage_Dataflow.csv" hash="02ddb4090005e6678f020ac96c2cbe81"/><file name="Mage_Directory.csv" hash="b21c04a44d3d2f2e35660963468ef32f"/><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="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="53c0c0f9390456fd1be2df79ed995a61"/><file name="Mage_Page.csv" hash="d88d9afcf6e894cd7afba2b226037ff5"/><file name="Mage_PageCache.csv" hash="4bd38621bb26a02a15251fcb37e1408b"/><file name="Mage_Paygate.csv" hash="311566b283975d5c481046346023026b"/><file name="Mage_Payment.csv" hash="23787bc886c5c06d74c216b6d30a2acb"/><file name="Mage_Paypal.csv" hash="30f695efd578e230fd9bb9ece343f5ba"/><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="98f1525c2101c8557af6118e2dd48822"/><file name="Mage_Review.csv" hash="87462f3f70a06521e8e85279edea4eb9"/><file name="Mage_Rss.csv" hash="f99bd663f6b7becac87c8be1720f14b3"/><file name="Mage_Rule.csv" hash="0b655f98a5c7e98f672fcd04395c9a93"/><file name="Mage_Sales.csv" hash="b44152ebfd7b0cbf361617e9ff644274"/><file name="Mage_SalesRule.csv" hash="1703499a655a66855f2fa13597c09587"/><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="a0665ad32147d01fec271dc8d2ee12d1"/><file name="Mage_Usa.csv" hash="1dac3b6f90d783295d4a8951da5d1eb8"/><file name="Mage_Weee.csv" hash="24bf654bb76513299a5cd227fed63f4a"/><file name="Mage_Widget.csv" hash="70a76519c347dd8f4209cb3dac849fe6"/><file name="Mage_Wishlist.csv" hash="ffcce9621e5cae730c05853c81c3e80d"/><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="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>