Index: branches/5.0.x/core/kernel/nparser/nparser.php
===================================================================
diff -u -r12323 -r12335
--- branches/5.0.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 12323)
+++ branches/5.0.x/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 12335)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: nparser.php 12323 2009-08-17 20:39:30Z alex $
+* @version	$Id: nparser.php 12335 2009-08-18 05:49:45Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -550,12 +550,12 @@
 		$param_string = $block_name . ':' . $function_name;
 
 		if ($design) {
-			$btn_text = 'Edit design';
+			$btn_text = $this->Application->Phrase('la_btn_EditDesign', false);
 			$btn_class = 'cms-edit-design-btn';
 			$btn_container_class = 'block-edit-design-btn-container';
 		}
 		else {
-			$btn_text = 'Edit block';
+			$btn_text = $this->Application->Phrase('la_btn_EditBlock', false);
 			$btn_class = 'cms-edit-block-btn';
 			$btn_container_class = 'block-edit-block-btn-container';
 		}
Index: branches/5.0.x/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -r12325 -r12335
--- branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12325)
+++ branches/5.0.x/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 12335)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: categories_tag_processor.php 12325 2009-08-17 21:53:51Z alex $
+* @version	$Id: categories_tag_processor.php 12335 2009-08-18 05:49:45Z dmitrya $
 * @package	In-Portal
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -1169,7 +1169,7 @@
 						<div class="cms-btn-image">
 							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
 						</div>
-						<div class="cms-btn-text">Edit content '.(defined('DEBUG_MODE') && DEBUG_MODE ? " - #{$num}" : '').'</div>
+						<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_EditContent', false) . ' '.(defined('DEBUG_MODE') && DEBUG_MODE ? " - #{$num}" : '').'</div>
 					</div>
 					<div class="cms-btn-content">';
 
@@ -1449,7 +1449,7 @@
 						<div class="cms-btn-image">
 							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
 						</div>
-						<div class="cms-btn-text">Section Properties</div>
+						<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_SectionProperties', false) . '</div>
 					</div>' . "\n";
 			} elseif (EDITING_MODE == EDITING_MODE_DESIGN) {
 				$url_params = Array(
@@ -1474,21 +1474,21 @@
 							<div class="cms-btn-image">
 								<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
 							</div>
-							<div class="cms-btn-text">Save changes</div>
+							<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_SaveChanges', false) . '</div>
 						</div>
 						<div class="cms-cancel-layout-btn" onclick="aTemplateManager.cancelLayout(); return false;">
 							<div class="cms-btn-image">
 								<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
 							</div>
-							<div class="cms-btn-text">Cancel</div>
+							<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_Cancel', false) . '</div>
 						</div>
 					</div>
 
 					<div class="cms-section-properties-btn"' . ($display_mode === false ? ' style="margin: 0px;"' : '') . ' onmouseover="window.status=\''.$edit_url.'\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; std_edit_item(\'theme\', \'themes/file_edit\');">
 						<div class="cms-btn-image">
 							<img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
 						</div>
-						<div class="cms-btn-text">Section Template</div>
+						<div class="cms-btn-text">' . $this->Application->Phrase('la_btn_SectionTemplate', false) . '</div>
 					</div>' . "\n";
 			}
 
Index: branches/5.0.x/core/install/english.lang
===================================================================
diff -u -r12320 -r12335
--- branches/5.0.x/core/install/english.lang	(.../english.lang)	(revision 12320)
+++ branches/5.0.x/core/install/english.lang	(.../english.lang)	(revision 12335)
@@ -20,9 +20,15 @@
 			<PHRASE Label="la_btn_Delete" Module="Core" Type="1">RGVsZXRl</PHRASE>
 			<PHRASE Label="la_btn_Down" Module="Core" Type="1">RG93bg==</PHRASE>
 			<PHRASE Label="la_btn_Edit" Module="Core" Type="1">RWRpdA==</PHRASE>
+			<PHRASE Label="la_btn_EditBlock" Module="Core" Type="1">RWRpdCBibG9jaw==</PHRASE>
+			<PHRASE Label="la_btn_EditContent" Module="Core" Type="1">RWRpdCBjb250ZW50</PHRASE>
+			<PHRASE Label="la_btn_EditDesign" Module="Core" Type="1">RWRpdCBkZXNpZ24=</PHRASE>
 			<PHRASE Label="la_btn_MoveDown" Module="Core" Type="1">TW92ZSBEb3du</PHRASE>
 			<PHRASE Label="la_btn_MoveUp" Module="Core" Type="1">TW92ZSBVcA==</PHRASE>
 			<PHRASE Label="la_btn_Save" Module="Core" Type="1">U2F2ZQ==</PHRASE>
+			<PHRASE Label="la_btn_SaveChanges" Module="Core" Type="1">U2F2ZSBDaGFuZ2Vz</PHRASE>
+			<PHRASE Label="la_btn_SectionProperties" Module="Core" Type="1">U2VjdGlvbiBQcm9wZXJ0aWVz</PHRASE>
+			<PHRASE Label="la_btn_SectionTemplate" Module="Core" Type="1">U2VjdGlvbiBUZW1wbGF0ZQ==</PHRASE>
 			<PHRASE Label="la_btn_Up" Module="Core" Type="1">VXA=</PHRASE>
 			<PHRASE Label="la_Cancel" Module="Core" Type="1">Q2FuY2Vs</PHRASE>
 			<PHRASE Label="la_category" Module="Core" Type="1">U2VjdGlvbg==</PHRASE>
@@ -869,7 +875,7 @@
 			<PHRASE Label="la_opt_After" Module="Core" Type="1">QWZ0ZXI=</PHRASE>
 			<PHRASE Label="la_opt_Allow" Module="Core" Type="1">QWxsb3c=</PHRASE>
 			<PHRASE Label="la_opt_Before" Module="Core" Type="1">QmVmb3Jl</PHRASE>
-			<PHRASE Label="la_opt_Cancelled" Module="Core" Type="1">Q2FuY2VsbGVk</PHRASE>
+			<PHRASE Label="la_opt_Cancelled" Module="Core" Type="1">Q2FuY2VsZWQ=</PHRASE>
 			<PHRASE Label="la_opt_City" Module="Core" Type="1">Q2l0eQ==</PHRASE>
 			<PHRASE Label="la_opt_Colon" Module="Core" Type="1">Q29sb24=</PHRASE>
 			<PHRASE Label="la_opt_Comma" Module="Core" Type="1">Q29tbWE=</PHRASE>