diff --git a/application/classes/actions/ActionAjax.class.php b/application/classes/actions/ActionAjax.class.php
index bf755a33..aea46292 100644
--- a/application/classes/actions/ActionAjax.class.php
+++ b/application/classes/actions/ActionAjax.class.php
@@ -877,7 +877,7 @@ class ActionAjax extends Action {
 	 * Получение информации о голосовании за топик
 	 */
 	protected function EventVoteGetInfoTopic() {
-		if (!($oTopic = $this->Topic_GetTopicById(getRequestStr('id', null, 'post'))) ) {
+		if (!($oTopic = $this->Topic_GetTopicById(getRequestStr('iTargetId', null, 'post'))) ) {
 			return $this->EventErrorDebug();
 		}
 
@@ -887,10 +887,10 @@ class ActionAjax extends Action {
 
 		$oViewer = $this->Viewer_GetLocalViewer();
 
-		$oViewer->Assign('oTopic', $oTopic);
+		$oViewer->Assign('oObject', $oTopic);
 		$oViewer->Assign('oUserCurrent', $this->oUserCurrent);
 
-		$this->Viewer_AssignAjax('sText', $oViewer->Fetch("vote.info.tpl"));
+		$this->Viewer_AssignAjax('sText', $oViewer->Fetch("components/vote/vote.info.tpl"));
 	}
 
 	/**
@@ -970,7 +970,7 @@ class ActionAjax extends Action {
 		/**
 		 * Комментарий существует?
 		 */
-		if (!($oComment=$this->Comment_GetCommentById(getRequestStr('idComment',null,'post')))) {
+		if (!($oComment=$this->Comment_GetCommentById(getRequestStr('iTargetId',null,'post')))) {
 			return $this->EventErrorDebug();
 		}
 		/**
@@ -1046,28 +1046,28 @@ class ActionAjax extends Action {
 		/**
 		 * Топик существует?
 		 */
-		if (!($oTopic=$this->Topic_GetTopicById(getRequestStr('idTopic',null,'post')))) {
+		if (!($oTopic=$this->Topic_GetTopicById(getRequestStr('iTargetId',null,'post')))) {
 			return $this->EventErrorDebug();
 		}
 		/**
 		 * Голосует автор топика?
 		 */
 		if ($oTopic->getUserId()==$this->oUserCurrent->getId()) {
-			$this->Message_AddErrorSingle($this->Lang_Get('topic_vote_error_self'),$this->Lang_Get('attention'));
+			$this->Message_AddErrorSingle($this->Lang_Get('vote.notices.error_self'),$this->Lang_Get('attention'));
 			return;
 		}
 		/**
 		 * Пользователь уже голосовал?
 		 */
 		if ($oTopicVote=$this->Vote_GetVote($oTopic->getId(),'topic',$this->oUserCurrent->getId())) {
-			$this->Message_AddErrorSingle($this->Lang_Get('topic_vote_error_already'),$this->Lang_Get('attention'));
+			$this->Message_AddErrorSingle($this->Lang_Get('vote.notices.error_already_voted'),$this->Lang_Get('attention'));
 			return;
 		}
 		/**
 		 * Время голосования истекло?
 		 */
 		if (strtotime($oTopic->getDateAdd())<=time()-Config::Get('acl.vote.topic.limit_time')) {
-			$this->Message_AddErrorSingle($this->Lang_Get('topic_vote_error_time'),$this->Lang_Get('attention'));
+			$this->Message_AddErrorSingle($this->Lang_Get('vote.notices.error_time'),$this->Lang_Get('attention'));
 			return;
 		}
 		/**
@@ -1081,7 +1081,7 @@ class ActionAjax extends Action {
 		 * Права на голосование
 		 */
 		if (!$this->ACL_CanVoteTopic($this->oUserCurrent,$oTopic) and $iValue) {
-			$this->Message_AddErrorSingle($this->Lang_Get('topic_vote_error_acl'),$this->Lang_Get('attention'));
+			$this->Message_AddErrorSingle($this->Lang_Get('vote.notices.error_acl'),$this->Lang_Get('attention'));
 			return;
 		}
 		/**
@@ -1108,9 +1108,9 @@ class ActionAjax extends Action {
 		}
 		if ($this->Vote_AddVote($oTopicVote) and $this->Topic_UpdateTopic($oTopic)) {
 			if ($iValue) {
-				$this->Message_AddNoticeSingle($this->Lang_Get('topic_vote_ok'),$this->Lang_Get('attention'));
+				$this->Message_AddNoticeSingle($this->Lang_Get('vote.notices.success'),$this->Lang_Get('attention'));
 			} else {
-				$this->Message_AddNoticeSingle($this->Lang_Get('topic_vote_ok_abstain'),$this->Lang_Get('attention'));
+				$this->Message_AddNoticeSingle($this->Lang_Get('vote.notices.success_abstain'),$this->Lang_Get('attention'));
 			}
 			$this->Viewer_AssignAjax('iRating',$oTopic->getRating());
 			/**
@@ -1137,21 +1137,21 @@ class ActionAjax extends Action {
 		/**
 		 * Блог существует?
 		 */
-		if (!($oBlog=$this->Blog_GetBlogById(getRequestStr('idBlog',null,'post')))) {
+		if (!($oBlog=$this->Blog_GetBlogById(getRequestStr('iTargetId',null,'post')))) {
 			return $this->EventErrorDebug();
 		}
 		/**
 		 * Голосует за свой блог?
 		 */
 		if ($oBlog->getOwnerId()==$this->oUserCurrent->getId()) {
-			$this->Message_AddErrorSingle($this->Lang_Get('blog.vote.notices.error_self'),$this->Lang_Get('attention'));
+			$this->Message_AddErrorSingle($this->Lang_Get('vote.notices.error_self'),$this->Lang_Get('attention'));
 			return;
 		}
 		/**
 		 * Уже голосовал?
 		 */
 		if ($oBlogVote=$this->Vote_GetVote($oBlog->getId(),'blog',$this->oUserCurrent->getId())) {
-			$this->Message_AddErrorSingle($this->Lang_Get('blog.vote.notices.error_already'),$this->Lang_Get('attention'));
+			$this->Message_AddErrorSingle($this->Lang_Get('vote.notices.error_already_voted'),$this->Lang_Get('attention'));
 			return;
 		}
 		/**
@@ -1193,7 +1193,7 @@ class ActionAjax extends Action {
 
 			default:
 			case ModuleACL::CAN_VOTE_BLOG_FALSE:
-				$this->Message_AddErrorSingle($this->Lang_Get('blog.vote.notices.error_acl'),$this->Lang_Get('attention'));
+				$this->Message_AddErrorSingle($this->Lang_Get('vote.notices.error_acl'),$this->Lang_Get('attention'));
 				return;
 				break;
 		}
@@ -1213,28 +1213,28 @@ class ActionAjax extends Action {
 		/**
 		 * Пользователь существует?
 		 */
-		if (!($oUser=$this->User_GetUserById(getRequestStr('idUser',null,'post')))) {
+		if (!($oUser=$this->User_GetUserById(getRequestStr('iTargetId',null,'post')))) {
 			return $this->EventErrorDebug();
 		}
 		/**
 		 * Голосует за себя?
 		 */
 		if ($oUser->getId()==$this->oUserCurrent->getId()) {
-			$this->Message_AddErrorSingle($this->Lang_Get('user_vote_error_self'),$this->Lang_Get('attention'));
+			$this->Message_AddErrorSingle($this->Lang_Get('vote.notices.error_self'),$this->Lang_Get('attention'));
 			return;
 		}
 		/**
 		 * Уже голосовал?
 		 */
 		if ($oUserVote=$this->Vote_GetVote($oUser->getId(),'user',$this->oUserCurrent->getId())) {
-			$this->Message_AddErrorSingle($this->Lang_Get('user_vote_error_already'),$this->Lang_Get('attention'));
+			$this->Message_AddErrorSingle($this->Lang_Get('vote.notices.error_already_voted'),$this->Lang_Get('attention'));
 			return;
 		}
 		/**
 		 * Имеет право на голосование?
 		 */
 		if (!$this->ACL_CanVoteUser($this->oUserCurrent,$oUser)) {
-			$this->Message_AddErrorSingle($this->Lang_Get('user_vote_error_acl'),$this->Lang_Get('attention'));
+			$this->Message_AddErrorSingle($this->Lang_Get('vote.notices.error_acl'),$this->Lang_Get('attention'));
 			return;
 		}
 		/**
@@ -1258,7 +1258,7 @@ class ActionAjax extends Action {
 		//$oUser->setRating($oUser->getRating()+$iValue);
 		$oUser->setCountVote($oUser->getCountVote()+1);
 		if ($this->Vote_AddVote($oUserVote) and $this->User_Update($oUser)) {
-			$this->Message_AddNoticeSingle($this->Lang_Get('user_vote_ok'),$this->Lang_Get('attention'));
+			$this->Message_AddNoticeSingle($this->Lang_Get('vote.notices.success'),$this->Lang_Get('attention'));
 			$this->Viewer_AssignAjax('iRating',$oUser->getRating());
 			$this->Viewer_AssignAjax('iSkill',$oUser->getSkill());
 			$this->Viewer_AssignAjax('iCountVote',$oUser->getCountVote());
diff --git a/application/classes/actions/ActionStream.class.php b/application/classes/actions/ActionStream.class.php
index ba31f15d..a13ba976 100644
--- a/application/classes/actions/ActionStream.class.php
+++ b/application/classes/actions/ActionStream.class.php
@@ -283,7 +283,7 @@ class ActionStream extends Action {
 			$this->Message_AddError($this->Lang_Get('system_error'),$this->Lang_Get('error'));
 		}
 		if ($this->oUserCurrent->getId() == getRequestStr('id')) {
-			$this->Message_AddError($this->Lang_Get('stream_error_subscribe_to_yourself'),$this->Lang_Get('error'));
+			$this->Message_AddError($this->Lang_Get('user_list_add.notices.error_self'),$this->Lang_Get('error'));
 			return;
 		}
 		/**
diff --git a/application/classes/actions/ActionTalk.class.php b/application/classes/actions/ActionTalk.class.php
index fb0a8bfd..13ca29e6 100644
--- a/application/classes/actions/ActionTalk.class.php
+++ b/application/classes/actions/ActionTalk.class.php
@@ -760,7 +760,7 @@ class ActionTalk extends Action {
 				$aResult[]=array(
 					'bStateError'=>true,
 					'sMsgTitle'=>$this->Lang_Get('error'),
-					'sMsg'=>$this->Lang_Get('talk_blacklist_add_self')
+					'sMsg'=>$this->Lang_Get('user_list_add.notices.error_self')
 				);
 				continue;
 			}
@@ -799,7 +799,7 @@ class ActionTalk extends Action {
 					$aResult[]=array(
 						'bStateError'=>true,
 						'sMsgTitle'=>$this->Lang_Get('error'),
-						'sMsg'=>$this->Lang_Get('talk_blacklist_user_already_have',array('login'=>htmlspecialchars($sUser))),
+						'sMsg'=>$this->Lang_Get('user_list_add.notices.error_already_added',array('login'=>htmlspecialchars($sUser))),
 						'sUserLogin'=>htmlspecialchars($sUser)
 					);
 					continue;
@@ -947,7 +947,7 @@ class ActionTalk extends Action {
 		}
 		$this->Message_AddNoticeSingle(
 			$this->Lang_Get(
-				'talk_speaker_delete_ok',
+				'common.success.remove',
 				array('login'=>$oUserTarget->getLogin())
 			),
 			$this->Lang_Get('attention')
@@ -1021,7 +1021,7 @@ class ActionTalk extends Action {
 				$aResult[]=array(
 					'bStateError'=>true,
 					'sMsgTitle'=>$this->Lang_Get('error'),
-					'sMsg'=>$this->Lang_Get('talk_speaker_add_self')
+					'sMsg'=>$this->Lang_Get('user_list_add.notices.error_self')
 				);
 				continue;
 			}
@@ -1055,7 +1055,7 @@ class ActionTalk extends Action {
 									$aResult[]=array(
 										'bStateError'=>false,
 										'sMsgTitle'=>$this->Lang_Get('attention'),
-										'sMsg'=>$this->Lang_Get('talk_speaker_add_ok',array('login',htmlspecialchars($sUser))),
+										'sMsg'=>$this->Lang_Get('user_list_add.notices.success_add',array('login',htmlspecialchars($sUser))),
 										'iUserId'=>$oUser->getId(),
 										'sUserLogin'=>$oUser->getLogin(),
 										'sUserLink'=>$oUser->getUserWebPath(),
@@ -1079,7 +1079,7 @@ class ActionTalk extends Action {
 								$aResult[]=array(
 									'bStateError'=>true,
 									'sMsgTitle'=>$this->Lang_Get('error'),
-									'sMsg'=>$this->Lang_Get('talk_speaker_user_already_exist',array('login'=>htmlspecialchars($sUser)))
+									'sMsg'=>$this->Lang_Get('user_list_add.notices.error_already_added',array('login'=>htmlspecialchars($sUser)))
 								);
 								break;
 							/**
@@ -1121,7 +1121,7 @@ class ActionTalk extends Action {
 						$aResult[]=array(
 							'bStateError'=>false,
 							'sMsgTitle'=>$this->Lang_Get('attention'),
-							'sMsg'=>$this->Lang_Get('talk_speaker_add_ok',array('login',htmlspecialchars($sUser))),
+							'sMsg'=>$this->Lang_Get('user_list_add.notices.success_add',array('login',htmlspecialchars($sUser))),
 							'iUserId'=>$oUser->getId(),
 							'sHtml'=>$oViewer->Fetch("user_list_small_item.message.tpl")
 						);
diff --git a/application/classes/actions/ActionUserfeed.class.php b/application/classes/actions/ActionUserfeed.class.php
index ee626cdd..911b9b1b 100644
--- a/application/classes/actions/ActionUserfeed.class.php
+++ b/application/classes/actions/ActionUserfeed.class.php
@@ -158,7 +158,7 @@ class ActionUserfeed extends Action {
 					return;
 				}
 				if ($this->oUserCurrent->getId() == getRequestStr('id')) {
-					$this->Message_AddError($this->Lang_Get('userfeed_error_subscribe_to_yourself'),$this->Lang_Get('error'));
+					$this->Message_AddError($this->Lang_Get('user_list_add.notices.error_self'),$this->Lang_Get('error'));
 					return;
 				}
 				break;
@@ -170,7 +170,7 @@ class ActionUserfeed extends Action {
 		 * Подписываем
 		 */
 		$this->Userfeed_subscribeUser($this->oUserCurrent->getId(), $iType, getRequestStr('id'));
-		$this->Message_AddNotice($this->Lang_Get('userfeed_subscribes_updated'), $this->Lang_Get('attention'));
+		$this->Message_AddNotice($this->Lang_Get('common.success.save'), $this->Lang_Get('attention'));
 	}
 	/**
 	 * Подписка на пользвователя по логину
@@ -275,7 +275,7 @@ class ActionUserfeed extends Action {
 		 * Отписываем пользователя
 		 */
 		$this->Userfeed_unsubscribeUser($this->oUserCurrent->getId(), $iType, $sId);
-		$this->Message_AddNotice($this->Lang_Get('userfeed_subscribes_updated'), $this->Lang_Get('attention'));
+		$this->Message_AddNotice($this->Lang_Get('common.success.save'), $this->Lang_Get('attention'));
 	}
 	/**
 	 * При завершении экшена загружаем в шаблон необходимые переменные