Index: branches/5.0.x/install/upgrades.sql
===================================================================
diff -u -r13221 -r13282
--- branches/5.0.x/install/upgrades.sql	(.../upgrades.sql)	(revision 13221)
+++ branches/5.0.x/install/upgrades.sql	(.../upgrades.sql)	(revision 13282)
@@ -121,4 +121,10 @@
 
 # ===== v 5.0.2 =====
 
-# ===== v 5.0.3-B1 =====
\ No newline at end of file
+# ===== v 5.0.3-B1 =====
+UPDATE Phrase
+SET PhraseType = 1
+WHERE Phrase IN (
+	'la_ship_All_Together', 'la_ship_Backorders_Upon_Avail', 'la_ship_Backorder_Separately',
+	'lu_ship_Shipment', 'lu_ship_ShippingType'
+);
\ No newline at end of file
Index: branches/5.0.x/install/english.lang
===================================================================
diff -u -r12964 -r13282
--- branches/5.0.x/install/english.lang	(.../english.lang)	(revision 12964)
+++ branches/5.0.x/install/english.lang	(.../english.lang)	(revision 13282)
@@ -114,8 +114,6 @@
 			<PHRASE Label="la_col_EndedOn" Module="In-Commerce" Type="1">RW5kZWQgT24=</PHRASE>
 			<PHRASE Label="la_col_Expiration" Module="In-Commerce" Type="1">RXhwaXJhdGlvbg==</PHRASE>
 			<PHRASE Label="la_col_ExtendedPrice" Module="In-Commerce" Type="1">RXh0LiBQcmljZQ==</PHRASE>
-			<PHRASE Label="la_col_FileName" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
-			<PHRASE Label="la_col_FilePath" Module="In-Commerce" Type="1">RmlsZW5hbWU=</PHRASE>
 			<PHRASE Label="la_col_FlatSurcharge" Module="In-Commerce" Type="1">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
 			<PHRASE Label="la_col_FromAmount" Module="In-Commerce" Type="1">RnJvbSBBbW91bnQ=</PHRASE>
 			<PHRASE Label="la_col_FromUser" Module="In-Commerce" Type="1">RnJvbSBVc2Vy</PHRASE>
@@ -338,7 +336,6 @@
 			<PHRASE Label="la_fld_End" Module="In-Commerce" Type="1">RW5kIERhdGU=</PHRASE>
 			<PHRASE Label="la_fld_Expiration" Module="In-Commerce" Type="1">RXhwaXJhdGlvbg==</PHRASE>
 			<PHRASE Label="la_fld_Featured" Module="In-Commerce" Type="1">RmVhdHVyZWQ=</PHRASE>
-			<PHRASE Label="la_fld_FilePath" Module="In-Commerce" Type="1">RmlsZQ==</PHRASE>
 			<PHRASE Label="la_fld_FirstDayDelivery" Module="In-Commerce" Type="1">Rmlyc3QgRGF5</PHRASE>
 			<PHRASE Label="la_fld_FlatSurcharge" Module="In-Commerce" Type="1">RmxhdCBTdXJjaGFyZ2U=</PHRASE>
 			<PHRASE Label="la_fld_FreeShippingMinAmount" Module="In-Commerce" Type="1">TWluaW11bSBPcmRlciBUb3RhbCBmb3IgRnJlZSBTaGlwcGluZw==</PHRASE>
@@ -408,7 +405,6 @@
 			<PHRASE Label="la_fld_Product_MaxHotNumber" Module="In-Commerce" Type="1">TWF4aW11bSBudW1iZXIgb2YgVG9wIFNlbGxlciBpdGVtcw==</PHRASE>
 			<PHRASE Label="la_fld_Product_MinPopRating" Module="In-Commerce" Type="1">TWluaW11bSByYXRpbmcgdG8gY29uc2lkZXIgaXRlbSBQT1A=</PHRASE>
 			<PHRASE Label="la_fld_Product_MinPopVotes" Module="In-Commerce" Type="1">TWluaW11bSBudW1iZXIgb2Ygc29sZCBpdGVtcyB0byBjb25zaWRlciBpdGVtIFBPUA==</PHRASE>
-			<PHRASE Label="la_fld_Qty" Module="In-Commerce" Type="1">UXVhbnRpdHk=</PHRASE>
 			<PHRASE Label="la_fld_QtyBackOrdered" Module="In-Commerce" Type="1">UXR5IEJhY2tPcmRlcmVk</PHRASE>
 			<PHRASE Label="la_fld_QtyInStock" Module="In-Commerce" Type="1">UXR5IEluIFN0b2Nr</PHRASE>
 			<PHRASE Label="la_fld_QtyInStockMin" Module="In-Commerce" Type="1">TWluaW11bSBxdWFudGl0eSBpbiBzdG9jayB0aHJlc2hvbGQ=</PHRASE>
@@ -564,7 +560,6 @@
 			<PHRASE Label="la_NZD" Module="In-Commerce" Type="1">TmV3IFplYWxhbmQgRG9sbGFy</PHRASE>
 			<PHRASE Label="la_OMR" Module="In-Commerce" Type="1">UmlhbCBPbWFuaQ==</PHRASE>
 			<PHRASE Label="la_OnlineStore" Module="In-Commerce" Type="1">T25saW5lIFN0b3Jl</PHRASE>
-			<PHRASE Label="la_opt_Email" Module="In-Commerce" Type="1">RS1tYWls</PHRASE>
 			<PHRASE Label="la_opt_Exchange" Module="In-Commerce" Type="1">RXhjaGFuZ2U=</PHRASE>
 			<PHRASE Label="la_opt_List" Module="In-Commerce" Type="1">TGlzdGluZw==</PHRASE>
 			<PHRASE Label="la_opt_PermanentCookie" Module="In-Commerce" Type="1">UGVybWFuZW50IENvb2tpZQ==</PHRASE>
@@ -665,9 +660,9 @@
 			<PHRASE Label="la_shipping_Limited" Module="In-Commerce" Type="1">U2VsZWN0ZWQgT25seQ==</PHRASE>
 			<PHRASE Label="la_Shipping_Name" Module="In-Commerce" Type="1">TmFtZQ==</PHRASE>
 			<PHRASE Label="la_Shipping_Type" Module="In-Commerce" Type="1">VHlwZQ==</PHRASE>
-			<PHRASE Label="la_ship_All_Together" Module="In-Commerce" Type="0">U2hpcCBhbGwgaXRlbXMgdG9nZXRoZXI=</PHRASE>
-			<PHRASE Label="la_ship_Backorders_Upon_Avail" Module="In-Commerce" Type="0">U2hpcCBiYWNrb3JkZXJzIHVwb24gYXZhaWxhYmxl</PHRASE>
-			<PHRASE Label="la_ship_Backorder_Separately" Module="In-Commerce" Type="0">U2hpcCBiYWNrb3JkZXJlZCBpdGVtcyBzZXBhcmF0ZWx5</PHRASE>
+			<PHRASE Label="la_ship_All_Together" Module="In-Commerce" Type="1">U2hpcCBhbGwgaXRlbXMgdG9nZXRoZXI=</PHRASE>
+			<PHRASE Label="la_ship_Backorders_Upon_Avail" Module="In-Commerce" Type="1">U2hpcCBiYWNrb3JkZXJzIHVwb24gYXZhaWxhYmxl</PHRASE>
+			<PHRASE Label="la_ship_Backorder_Separately" Module="In-Commerce" Type="1">U2hpcCBiYWNrb3JkZXJlZCBpdGVtcyBzZXBhcmF0ZWx5</PHRASE>
 			<PHRASE Label="la_SHP" Module="In-Commerce" Type="1">U2FpbnQgSGVsZW5hIFBvdW5k</PHRASE>
 			<PHRASE Label="la_SIT" Module="In-Commerce" Type="1">VG9sYXI=</PHRASE>
 			<PHRASE Label="la_SKK" Module="In-Commerce" Type="1">U2xvdmFrIEtvcnVuYQ==</PHRASE>
@@ -972,10 +967,10 @@
 			<PHRASE Label="lu_PermName_Product.Review_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0</PHRASE>
 			<PHRASE Label="lu_PermName_Product.Review_Pending_desc" Module="In-Commerce" Type="1">Q29tbWVudCBQcm9kdWN0IFBlbmRpbmc=</PHRASE>
 			<PHRASE Label="lu_PermName_Product.View_desc" Module="In-Commerce" Type="1">VmlldyBQcm9kdWN0</PHRASE>
+			<PHRASE Label="lu_ship_Shipment" Module="In-Commerce" Type="1">U2hpcG1lbnQ=</PHRASE>
+			<PHRASE Label="lu_ship_ShippingType" Module="In-Commerce" Type="1">U2hpcHBpbmcgVHlwZQ==</PHRASE>
 			<PHRASE Label="lu_title_ReviewProduct" Module="In-Commerce" Type="1">Q29tbWVudCB0aGlzIFByb2R1Y3Q=</PHRASE>
 			<PHRASE Label="lu_title_ShippingInformation" Module="In-Commerce" Type="1">U2hpcHBpbmcgSW5mb3JtYXRpb24=</PHRASE>
-			<PHRASE Label="lu_ship_Shipment" Module="In-Commerce" Type="0">U2hpcG1lbnQ=</PHRASE>
-			<PHRASE Label="lu_ship_ShippingType" Module="In-Commerce" Type="0">U2hpcHBpbmcgVHlwZQ==</PHRASE>
 		</PHRASES>
 		<EVENTS>
 			<EVENT MessageType="html" Event="AFFILIATE.PAYMENT" Type="0">U3ViamVjdDogQWZmaWxpYXRlIGNvbW1pc3Npb24gcGF5bWVudCBoYXMgYmVlbiBpc3N1ZWQKCllvdXIgYWZmaWxpYXRlIGNvbW1pc3Npb24gcGF5bWVudCBoYXMgYmVlbiBpc3N1ZWQsIHBsZWFzZSBsb2dpbiB0byBZb3VyIEFjY291bnQsIEFmZmlsaWF0ZSBQYXltZW50cyBzZWN0aW9uIHRvIGNoZWNrIHRoZSBkZXRhaWxzLg==</EVENT>