Index: branches/RC/admin/install/upgrades/changelog_4_2_1.txt
===================================================================
diff -u -r9725 -r9752
--- branches/RC/admin/install/upgrades/changelog_4_2_1.txt	(.../changelog_4_2_1.txt)	(revision 9725)
+++ branches/RC/admin/install/upgrades/changelog_4_2_1.txt	(.../changelog_4_2_1.txt)	(revision 9752)
@@ -17,9 +17,9 @@
 File in-portal/admin/install/install_lib.php changed
 File in-portal/admin/install/upgrade_errors.php changed
 File in-portal/admin/install/langpacks/english.lang changed
-File in-portal/admin/install/upgrades/changelog_4_2_1.txt is new; release_4_2_1 revision 1.1.2.2
+File in-portal/admin/install/upgrades/changelog_4_2_1.txt is new; release_4_2_1 revision 1.1.2.3
 File in-portal/admin/install/upgrades/inportal_upgrade_v4.2.1.php is new; release_4_2_1 revision 1.1.2.1
-File in-portal/admin/install/upgrades/inportal_upgrade_v4.2.1.sql is new; release_4_2_1 revision 1.1.2.13
+File in-portal/admin/install/upgrades/inportal_upgrade_v4.2.1.sql is new; release_4_2_1 revision 1.1.2.14
 File in-portal/admin/listview/listview.php changed
 File in-portal/admin/logs/email_log.php changed
 File in-portal/admin/modules/upgrade_lic.php changed
@@ -202,6 +202,7 @@
 File theme_portal2007/platform/elements/banners/banner_top.tpl is new; release_4_2_1 revision 1.1.2.2
 File theme_portal2007/platform/elements/content_boxes/related_items.tpl is new; release_4_2_1 revision 1.1.2.3
 File theme_portal2007/platform/elements/content_boxes/sub_categories.tpl changed
+File theme_portal2007/platform/elements/side_boxes/login.tpl changed
 File theme_portal2007/platform/elements/side_boxes/related_searches.tpl is new; release_4_2_1 revision 1.1.2.3
 File theme_portal2007/platform/elements/side_boxes/search.tpl changed
 File theme_portal2007/platform/img/google_map_sample.gif is new; release_4_2_1 revision 1.1.2.1
@@ -243,3 +244,7 @@
 Changes in phrases and events:
 
 
+Changed label "lu_EnterEmailToRecommend" of type "0"
+Changed label "lu_EnterEmailToSubscribe" of type "0"
+Changed label "lu_EnterEmailToRecommend" of type "0"
+Changed label "lu_EnterEmailToSubscribe" of type "0"
Index: branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.1.sql
===================================================================
diff -u -r9673 -r9752
--- branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.1.sql	(.../inportal_upgrade_v4.2.1.sql)	(revision 9673)
+++ branches/RC/admin/install/upgrades/inportal_upgrade_v4.2.1.sql	(.../inportal_upgrade_v4.2.1.sql)	(revision 9752)
@@ -19,6 +19,16 @@
 INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Catalog_PreselectModuleTab', 1, 'In-Portal', 'in-portal:configure_categories');
 INSERT INTO ConfigurationAdmin VALUES ('Catalog_PreselectModuleTab', 'la_Text_General', 'la_config_CatalogPreselectModuleTab', 'checkbox', NULL, NULL, 10.09, 0, 1);
 
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportDelimiter', 'la_Text_CSV_Export', 'la_config_CSVExportDelimiter', 'select', NULL, '0=la_Tab,1=la_Comma,2=la_Semicolon,3=la_Space,4=la_Colon', 40.1, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportEnclosure', 'la_Text_CSV_Export', 'la_config_CSVExportEnclosure', 'radio', NULL, '0=la_Doublequotes,1=la_Quotes', 40.2, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportSeparator', 'la_Text_CSV_Export', 'la_config_CSVExportSeparator', 'radio', NULL, '0=la_Linux,1=la_Windows', 40.3, 0, 1);
+INSERT INTO ConfigurationAdmin VALUES ('CSVExportEncoding', 'la_Text_CSV_Export', 'la_config_CSVExportEncoding', 'radio', NULL, '0=la_Unicode,1=la_Regular', 40.4, 0, 1);
+
+REPLACE INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportDelimiter', '0', 'In-Portal', 'in-portal:configure_general');
+REPLACE INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportEnclosure', '0', 'In-Portal', 'in-portal:configure_general');
+REPLACE INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportSeparator', '0', 'In-Portal', 'in-portal:configure_general');
+REPLACE INTO ConfigurationValues VALUES (DEFAULT, 'CSVExportEncoding', '0', 'In-Portal', 'in-portal:configure_general');
+
 CREATE TABLE ItemFiles (FileId int(11) NOT NULL auto_increment, ResourceId int(11) unsigned NOT NULL default '0', FileName varchar(255) NOT NULL default '', FilePath varchar(255) NOT NULL default '', Size int(11) NOT NULL default '0', `Status` tinyint(4) NOT NULL default '0', CreatedOn int(11) unsigned NOT NULL default '0', CreatedById int(11) NOT NULL default '-1', MimeType varchar(255) NOT NULL default '', PRIMARY KEY  (FileId), KEY ResourceId (ResourceId));
 
 UPDATE Modules SET Version = '4.2.1' WHERE Name = 'Core';
Index: branches/RC/admin/install/langpacks/english.lang
===================================================================
diff -u -r9724 -r9752
--- branches/RC/admin/install/langpacks/english.lang	(.../english.lang)	(revision 9724)
+++ branches/RC/admin/install/langpacks/english.lang	(.../english.lang)	(revision 9752)
@@ -179,7 +179,7 @@
 			<PHRASE Label="la_config_time_server" Module="In-Portal" Type="1">VGltZSB6b25lIG9mIHRoZSBzZXJ2ZXI=</PHRASE>
 			<PHRASE Label="la_config_UseOutputCompression" Module="In-Portal" Type="1">RW5hYmxlIEhUTUwgR1pJUCBjb21wcmVzc2lvbg==</PHRASE>
 			<PHRASE Label="la_config_UseSmallHeader" Module="In-Portal" Type="1">VXNlIFNtYWxsIEhlYWRlcg==</PHRASE>
-			<PHRASE Label="LA_CONFIG_USETOOLBARLABELS" Module="In-Portal" Type="1">VXNlIFRvb2xiYXIgTGFiZWxz</PHRASE>
+			<PHRASE Label="la_config_UseToolbarLabels" Module="In-Portal" Type="1">VXNlIFRvb2xiYXIgTGFiZWxzIGluIEFkbWlu</PHRASE>
 			<PHRASE Label="la_config_use_js_redirect" Module="In-Portal" Type="1">VXNlIEphdmFTY3JpcHQgcmVkaXJlY3Rpb24gYWZ0ZXIgbG9naW4vbG9nb3V0IChmb3IgSUlTKQ==</PHRASE>
 			<PHRASE Label="la_config_use_modrewrite" Module="In-Portal" Type="1">VXNlIE1PRCBSRVdSSVRF</PHRASE>
 			<PHRASE Label="la_config_use_modrewrite_with_ssl" Module="In-Portal" Type="1">RW5hYmxlIE1PRF9SRVdSSVRFIGZvciBTU0w=</PHRASE>
@@ -2059,7 +2059,7 @@
 			<PHRASE Label="lu_btn_DeleteFile" Module="In-Portal" Type="0">RGVsZXRlIEZpbGU=</PHRASE>
 			<PHRASE Label="lu_btn_DeleteImage" Module="In-Portal" Type="0">RGVsZXRlIEltYWdl</PHRASE>
 			<PHRASE Label="lu_btn_Details" Module="In-Portal" Type="0">RGV0YWlscw==</PHRASE>
-			<PHRASE Label="lu_btn_FindIt" Module="In-Portal" Type="0">RmluZCBJdA==</PHRASE>
+			<PHRASE Label="lu_btn_FindIt" Module="In-Portal" Type="0">RmluZCBpdA==</PHRASE>
 			<PHRASE Label="lu_btn_Go" Module="In-Portal" Type="0">R28=</PHRASE>
 			<PHRASE Label="lu_btn_Modify" Module="In-Portal" Type="0">TW9kaWZ5</PHRASE>
 			<PHRASE Label="lu_btn_MoreImages" Module="In-Portal" Type="0">TW9yZSBJbWFnZXM=</PHRASE>
@@ -2184,8 +2184,8 @@
 			<PHRASE Label="lu_end_on" Module="In-Portal" Type="0">RW5kIE9u</PHRASE>
 			<PHRASE Label="lu_enlarge_picture" Module="In-Portal" Type="0">Wm9vbSBpbg==</PHRASE>
 			<PHRASE Label="lu_enter" Module="In-Portal" Type="0">RW50ZXI=</PHRASE>
-			<PHRASE Label="lu_EnterEmailToRecommend" Module="In-Portal" Type="0">RW50ZXIgeW91ciBmcmllbmQgZS1tYWlsIGFkZHJlc3MgdG8gcmVjb21tZW5kIHRoaXMgc2l0ZQ==</PHRASE>
-			<PHRASE Label="lu_EnterEmailToSubscribe" Module="In-Portal" Type="0">RW50ZXIgeW91ciBlLW1haWwgYWRkcmVzcyB0byBzdWJzY3JpYmUgdG8gdGhlIG1haWxpbmcgbGlzdC4=</PHRASE>
+			<PHRASE Label="lu_EnterEmailToRecommend" Module="In-Portal" Type="0">RnJpZW5kJ3MgZS1tYWlsIGFkZHJlc3M=</PHRASE>
+			<PHRASE Label="lu_EnterEmailToSubscribe" Module="In-Portal" Type="0">WW91ciBlLW1haWwgYWRkcmVzcw==</PHRASE>
 			<PHRASE Label="lu_EnterForgotEmail" Module="In-Portal" Type="0">RW50ZXIgeW91ciBFbWFpbCBBZGRyZXNzIGJlbG93IHRvIGhhdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9uIHNlbnQgdG8gdGhlIGVtYWlsIGFkZHJlc3Mgb2YgeW91ciBhY2NvdW50Lg==</PHRASE>
 			<PHRASE Label="lu_EnterForgotUserEmail" Module="In-Portal" Type="0">RW50ZXIgeW91ciBVc2VybmFtZSBvciBFbWFpbCBBZGRyZXNzIGJlbG93IHRvIGhhdmUgeW91ciBhY2NvdW50IGluZm9ybWF0aW9uIHNlbnQgdG8gdGhlIGVtYWlsIGFkZHJlc3Mgb2YgeW91ciBhY2NvdW50Lg==</PHRASE>
 			<PHRASE Label="lu_ErrorAlreadyReviewed" Module="In-Portal" Type="0">WW91IGhhdmUgYWxyZWFkeSByZXZpZXdlZCB0aGlzIGl0ZW0hIFlvdXIgYXBwcm92ZWQgcmV2aWV3cyBhcmUgbGlzdGVkIGJlbG93Lg==</PHRASE>
@@ -2314,6 +2314,7 @@
 			<PHRASE Label="lu_fld_body" Module="In-Portal" Type="0">Qm9keQ==</PHRASE>
 			<PHRASE Label="lu_fld_Captcha" Module="In-Portal" Type="0">Q2FwdGNoYSBJbWFnZQ==</PHRASE>
 			<PHRASE Label="lu_fld_City" Module="In-Portal" Type="0">Q2l0eQ==</PHRASE>
+			<PHRASE Label="lu_fld_Comments" Module="In-Portal" Type="0">UXVlc3Rpb25z</PHRASE>
 			<PHRASE Label="lu_fld_Company" Module="In-Portal" Type="0">Q29tcGFueQ==</PHRASE>
 			<PHRASE Label="lu_fld_Country" Module="In-Portal" Type="0">Q291bnRyeQ==</PHRASE>
 			<PHRASE Label="lu_fld_Description" Module="In-Portal" Type="0">RGVzY3JpcHRpb24=</PHRASE>
@@ -2340,6 +2341,7 @@
 			<PHRASE Label="lu_fld_PrimaryImage" Module="In-Portal" Type="0">UHJpbWFyeSBJbWFnZQ==</PHRASE>
 			<PHRASE Label="lu_fld_primary_translation" Module="In-Portal" Type="0">UHJpbWFyeSBUcmFuc2xhdGlvbg==</PHRASE>
 			<PHRASE Label="lu_fld_Rating" Module="In-Portal" Type="0">UmF0aW5n</PHRASE>
+			<PHRASE Label="lu_fld_Referrer" Module="In-Portal" Type="0">UmVmZXJyZXI=</PHRASE>
 			<PHRASE Label="lu_fld_ReviewText" Module="In-Portal" Type="0">UmV2aWV3IHRleHQ=</PHRASE>
 			<PHRASE Label="lu_fld_SelectAddress" Module="In-Portal" Type="0">UGxlYXNlIHNlbGVjdCB5b3VyIGFkZHJlc3M=</PHRASE>
 			<PHRASE Label="lu_fld_size" Module="In-Portal" Type="0">U2l6ZQ==</PHRASE>