Index: branches/RC/tools/.htaccess
===================================================================
diff -u -r8929 -r9079
--- branches/RC/tools/.htaccess	(.../.htaccess)	(revision 8929)
+++ branches/RC/tools/.htaccess	(.../.htaccess)	(revision 9079)
@@ -1,9 +1,9 @@
 #Options +FollowSymLinks
-RewriteEngine On
+#RewriteEngine On
 
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteCond %{REQUEST_FILENAME}/ !-f
-RewriteCond %{REQUEST_FILENAME}/index.php !-f
-RewriteCond %{REQUEST_FILENAME}/index.html !-f
-RewriteCond %{REQUEST_URI} !\.(gif|jpg|png)
-RewriteRule ^(.*) index.php?rewrite=on&_mod_rw_url_=$1 [QSA]
+#RewriteCond %{REQUEST_FILENAME} !-f
+#RewriteCond %{REQUEST_FILENAME}/ !-f
+#RewriteCond %{REQUEST_FILENAME}/index.php !-f
+#RewriteCond %{REQUEST_FILENAME}/index.html !-f
+#RewriteCond %{REQUEST_URI} !\.(gif|jpg|png)
+#RewriteRule ^(.*) index.php?rewrite=on&_mod_rw_url_=$1 [QSA]
Index: branches/RC/themes/default2007/platform/login/register.tpl
===================================================================
diff -u -r9017 -r9079
--- branches/RC/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 9017)
+++ branches/RC/themes/default2007/platform/login/register.tpl	(.../register.tpl)	(revision 9079)
@@ -75,7 +75,8 @@
 					<input type="hidden" name="registration_confirm_template" value="platform/login/register_confirm" />
 					<input type="hidden" name="registration_confirm_pending_template" value="platform/login/register_confirm_pending" />
 
-					<input class="button" type="submit" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Create"/>"/>
+					<input class="button" type="submit" name="events[u][OnCreate]" value="<inp2:m_Phrase label="lu_btn_Register"/>"/>
+					<input type="button" class="button" onclick="history.back();" value="<inp2:m_Phrase name="lu_btn_Cancel"/>"/>
 				</inp2:m_RenderElement>
 			</table>
 		</form>
Index: branches/RC/themes/default2007/platform/my_account/public_profile.tpl
===================================================================
diff -u -r9071 -r9079
--- branches/RC/themes/default2007/platform/my_account/public_profile.tpl	(.../public_profile.tpl)	(revision 9071)
+++ branches/RC/themes/default2007/platform/my_account/public_profile.tpl	(.../public_profile.tpl)	(revision 9079)
@@ -35,7 +35,7 @@
 
 			<inp2:m_RenderElement name="profile_element" field="pp_firstname" title="lu_fld_FirstName"/>
 			<inp2:m_RenderElement name="profile_element" field="pp_lastname" title="lu_fld_LastName"/>
-			<inp2:m_RenderElement name="profile_element" field="pp_dob" title="lu_fld_BirthDay"/>
+			<inp2:m_RenderElement name="profile_element" field="pp_dob" title="lu_fld_BirthDate"/>
 			<inp2:m_RenderElement name="profile_element" field="pp_email" title="lu_fld_Email"/>
 			<inp2:m_RenderElement name="profile_element" field="pp_phone" title="lu_fld_Phone"/>
 			<inp2:m_RenderElement name="profile_element" field="pp_street" title="lu_fld_Street"/>
Index: branches/RC/core/admin_templates/catalog/catalog.tpl
===================================================================
diff -u -r9043 -r9079
--- branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 9043)
+++ branches/RC/core/admin_templates/catalog/catalog.tpl	(.../catalog.tpl)	(revision 9079)
@@ -50,14 +50,14 @@
 					 	) );
 
 
-				/*	a_toolbar.AddButton( new ToolBarButton('in-portal:editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTipSHORT_Edit_Current_Category" escape="1"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('in-portal:editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTipSHORT_Edit_Current_Category" escape="1"/>', function() {
 							var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
 							var $category_id = get_hidden_field('m_cat_id');
 							var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
 							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'in-portal/categories/categories_edit' : 'in-portal/categories/categories_edit_permissions');
 							redirect($redirect_url);
 							}
-						) );*/
+						) );
 
 					<inp2:m_ModuleInclude template="catalog_tab" tab_init="1" skip_prefixes="m"/>
 
Index: branches/RC/themes/default2007/platform/login/register_confirm_pending.tpl
===================================================================
diff -u -r8991 -r9079
--- branches/RC/themes/default2007/platform/login/register_confirm_pending.tpl	(.../register_confirm_pending.tpl)	(revision 8991)
+++ branches/RC/themes/default2007/platform/login/register_confirm_pending.tpl	(.../register_confirm_pending.tpl)	(revision 9079)
@@ -15,7 +15,7 @@
 			<inp2:m_phrase name="lu_title_RegistrationPendingConfirmation"/>
 		</inp2:m_Capture>
 
-		<inp2:m_phrase name="lu_RegistrationPendingCompleted"/>
+		<inp2:m_phrase name="lu_text_RegistrationPending"/>
 	</inp2:m_RenderElement>
 
 	<!-- // registration pending confirmation -->
Index: branches/RC/kernel/admin_templates/catalog.tpl
===================================================================
diff -u -r9043 -r9079
--- branches/RC/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 9043)
+++ branches/RC/kernel/admin_templates/catalog.tpl	(.../catalog.tpl)	(revision 9079)
@@ -50,14 +50,14 @@
 					 	) );
 
 
-				/*	a_toolbar.AddButton( new ToolBarButton('in-portal:editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTipSHORT_Edit_Current_Category" escape="1"/>', function() {
+				a_toolbar.AddButton( new ToolBarButton('in-portal:editcat', '<inp2:m_phrase label="la_ToolTip_Edit_Current_Category" escape="1"/>::<inp2:m_phrase label="la_ToolTipSHORT_Edit_Current_Category" escape="1"/>', function() {
 							var $edit_url = '<inp2:m_t t="#TEMPLATE#" m_opener="d" c_mode="t" c_event="OnEdit" c_id="#CATEGORY_ID#" pass="all,c" no_amp="1"/>';
 							var $category_id = get_hidden_field('m_cat_id');
 							var $redirect_url = $edit_url.replace('#CATEGORY_ID#', $category_id);
 							$redirect_url = $redirect_url.replace('#TEMPLATE#', $category_id > 0 ? 'in-portal/categories/categories_edit' : 'in-portal/categories/categories_edit_permissions');
 							redirect($redirect_url);
 							}
-						) );*/
+						) );
 
 					<inp2:m_ModuleInclude template="catalog_tab" tab_init="1" skip_prefixes="m"/>
 
Index: branches/RC/themes/default2007/index.tpl
===================================================================
diff -u -r9068 -r9079
--- branches/RC/themes/default2007/index.tpl	(.../index.tpl)	(revision 9068)
+++ branches/RC/themes/default2007/index.tpl	(.../index.tpl)	(revision 9079)
@@ -21,11 +21,14 @@
 		<inp2:m_if check="m_ModuleEnabled" module="In-Edit"/>
 			<inp2:cms_ContentBlock num="1"/>
 		<inp2:m_else/>
-		<!--## if In-edit (CMS) NOT installed! ##-->	
+		
+		<!--## Welcome text =>In-edit (CMS) NOT installed! ##-->	
 		In-portal is a revolutionary web site management system that allows you to automate and
 		facilitate management of large portal and community web sites. Regardless of whether you
 		are running a directory site or a content news portal, a community site or an online mall,
 		In-portal will enhance your web site management experience with innovative.
+		<!--## /Welcome text =>In-edit (CMS) NOT installed! ##-->	
+				
 		</inp2:m_if>
 		
 	</inp2:m_RenderElement>