Index: branches/5.1.x/install/upgrades.sql
===================================================================
diff -u -r13762 -r13769
--- branches/5.1.x/install/upgrades.sql (.../upgrades.sql) (revision 13762)
+++ branches/5.1.x/install/upgrades.sql (.../upgrades.sql) (revision 13769)
@@ -167,4 +167,15 @@
# ===== v 5.1.0-B2 =====
+# ===== v 5.1.0-RC1 =====
+UPDATE Phrase
+SET PhraseType = 1
+WHERE Phrase IN (
+ 'la_col_Qty', 'la_col_QtyBackordered', 'la_ItemBackordered', 'la_ship_all_together',
+ 'la_ship_backorders_upon_avail', 'la_ship_backorder_separately', 'la_tooltip_New_Coupon',
+ 'la_tooltip_New_Discount'
+);
+
+DELETE FROM Phrase WHERE Phrase = 'la_comm_ProductsByManuf';
+
# ===== v 5.1.0-RC1 =====
\ No newline at end of file
Index: branches/5.1.x/install/english.lang
===================================================================
diff -u -r13632 -r13769
--- branches/5.1.x/install/english.lang (.../english.lang) (revision 13632)
+++ branches/5.1.x/install/english.lang (.../english.lang) (revision 13769)
@@ -164,6 +164,8 @@
VHlwZQ==
V2VpZ2h0
UHJvZml0
+ UXR5
+ QmFja29yZGVyZWQ=
UXR5IEluIFN0b2Nr
UXR5SW5TdG9ja01pbg==
UXR5IE9uIE9yZGVy
@@ -334,7 +336,6 @@
RnJvbSBkYXRlL3RpbWU=
R2F0ZXdheQ==
R3JvdW5kIERlbGl2ZXJ5
- VXNlciBHcm91cA==
VXNlciBHcm91cHMgU2VsZWN0aW9u
SW5zdHJ1Y3Rpb25z
SW5zdXJhbmNlIENvc3Q=
@@ -491,6 +492,7 @@
SXJhbmlhbiBSaWFs
SWNlbGFuZCBLcm9uYQ==
SVNPIENvZGUgd2lsbCBiZSB1c2VkIGlmIGxlZnQgYmxhbms=
+ YmFja29yZGVyZWQ=
UHJvZHVjdHM=
SmFtYWljYW4gRG9sbGFy
Sm9yZGFuaWFuIERpbmFy
@@ -602,6 +604,13 @@
RGlzYWJsZSBTaGlwcGluZyBUeXBl
RW5hYmxlIFNoaXBwaW5nIFF1b3RpbmcgRW5naW5lcw==
RGlzYWJsZSBTaGlwcGluZyBRdW90aW5nIEVuZ2luZXM=
+ QWRkIFByb2R1Y3Q=
+ RGVsZXRlIFByb2R1Y3Q=
+ TW9kaWZ5IFByb2R1Y3Q=
+ UmF0ZSBQcm9kdWN0
+ Q29tbWVudCBQcm9kdWN0
+ Q29tbWVudCBQcm9kdWN0IFBlbmRpbmc=
+ VmlldyBQcm9kdWN0
TWFudWZhY3R1cmVycyBwZXIgcGFnZQ==
TWFudWZhY3R1cmVycyBwZXIgcGFnZSBvbiBhIHNob3J0IGxpc3Rpbmc=
TnVtYmVyIG9mIHByb2R1Y3RzIHBlciBwYWdl
@@ -909,6 +918,8 @@
TmV3IFRheCBab25l
TmV3IEFmZmlsaWF0ZQ==
TmV3IEFmZmlsaWF0ZSBQbGFu
+ TmV3IENvdXBvbg==
+ TmV3IERpc2NvdW50
TmV3IE9yZGVy
TmV3IFByaWNpbmcgTGltaXQ=
QWRkIG5ldyBwcm9kdWN0cw==
@@ -980,13 +991,6 @@
TGFzdCBRdWF0ZXI=
VGhpcyBpcyB5b3VyIHByb2ZpbGUgYWRkcmVzcy4gSXQgd2lsbCBiZSB1cGRhdGVkIGlmIHlvdSBlZGl0IHRoZSBhZGRyZXNzIGJlbG93Lg==
TWFudWZhY3R1cmVy
- QWRkIFByb2R1Y3Q=
- RGVsZXRlIFByb2R1Y3Q=
- TW9kaWZ5IFByb2R1Y3Q=
- UmF0ZSBQcm9kdWN0
- Q29tbWVudCBQcm9kdWN0
- Q29tbWVudCBQcm9kdWN0IFBlbmRpbmc=
- VmlldyBQcm9kdWN0
U2hpcG1lbnQ=
U2hpcHBpbmcgVHlwZQ==
Q29tbWVudCB0aGlzIFByb2R1Y3Q=
Index: branches/5.1.x/install/install_data.sql
===================================================================
diff -u -r13632 -r13769
--- branches/5.1.x/install/install_data.sql (.../install_data.sql) (revision 13632)
+++ branches/5.1.x/install/install_data.sql (.../install_data.sql) (revision 13769)
@@ -321,13 +321,13 @@
INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 3, 131);
INSERT INTO PaymentTypeCurrencies VALUES (DEFAULT, 1, 131);
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.RATE', 'lu_PermName_Product.Rate_desc', 'lu_PermName_Product.Rate_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW', 'lu_PermName_Product.Review_desc', 'lu_PermName_Product.Review_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 'lu_PermName_Product.Review_Pending_desc', ' lu_PermName_Product.Review_Pending_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.ADD', 'lu_PermName_Product.Add_desc', 'lu_PermName_Product.Add_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.DELETE', 'lu_PermName_Product.Delete_desc', 'lu_PermName_Product.Delete_error', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'lu_PermName_Product.Modify_desc', 'lu_PermName_Product.Modify_desc', 'In-Commerce');
-INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'lu_PermName_Product.View_desc', 'lu_PermName_Product.View_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.RATE', 'la_PermName_Product.Rate_desc', 'la_PermName_Product.Rate_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW', 'la_PermName_Product.Review_desc', 'la_PermName_Product.Review_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.REVIEW.PENDING', 'la_PermName_Product.Review_Pending_desc', ' la_PermName_Product.Review_Pending_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.ADD', 'la_PermName_Product.Add_desc', 'la_PermName_Product.Add_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.DELETE', 'la_PermName_Product.Delete_desc', 'la_PermName_Product.Delete_error', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.MODIFY', 'la_PermName_Product.Modify_desc', 'la_PermName_Product.Modify_desc', 'In-Commerce');
+INSERT INTO PermissionConfig VALUES (DEFAULT, 'PRODUCT.VIEW', 'la_PermName_Product.View_desc', 'la_PermName_Product.View_error', 'In-Commerce');
INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.VIEW', 14, 1, 0, {ProductCatId});
INSERT INTO Permissions VALUES (DEFAULT, 'PRODUCT.RATE', 13, 1, 0, {ProductCatId});