Index: branches/RC/themes/default2009/in-bulletin/elements/side_boxes/polls.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-bulletin/elements/side_boxes/polls.elm.tpl	(revision 11983)
+++ branches/RC/themes/default2009/in-bulletin/elements/side_boxes/polls.elm.tpl	(revision 11984)
@@ -1,65 +1,65 @@
 <!-- POllS -->
 <inp2:poll_InitList list_name="list_polls" per_page="-1"/>
 
 <inp2:m_Capture to_var="header">
 	<inp2:m_phrase name="lu_title_Polls"/>
 </inp2:m_Capture>
 
 <inp2:m_DefineElement name="answer_element">
 <li style="margin-bottom:5px;">
 	<input type="radio" name="poll_<inp2:Field name="PollId"/>" onclick="getElementById('selected_opt_<inp2:Field name="PollId"/>').value='<inp2:Field name="AnswerId"/>';" checked> <inp2:Field name="Answer"/>
 </li>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="poll_element">
 <div style="margin-bottom:25px;">
 	<div style="text-align:left;">
 		<strong><inp2:Field name="Question"/></strong>
 	</div>
 	<inp2:m_if check="Field" name="Image">
 	<br/>
 		<a href="<inp2:Field name="Image" format="resize:640x480"/>" class="thickbox" title="<inp2:Field field="Question"/>">
 			<img src="<inp2:Field name="Image" format="resize:100x100"/>" border="0" alt="<inp2:Field field="Question"/>"></a>
 	</inp2:m_if>
 
 	<div id="pollvote_<inp2:Field name="PollId"/>" style="text-align:left; margin-top:10px; margin-bottom:10px">
 	<inp2:m_if check="Field" name="RequireLogin">
 		<inp2:m_include t="in-bulletin/elements/side_boxes/poll_results.elm"/>
 		<div style="padding-top:5px; font-style: italic; font-weight: bold; text-align: center">
 			<inp2:m_phrase name="lu_text_GuestsLoginToVote"/>
 		</div>
 	<inp2:m_else/>
 		<inp2:m_if check="HasVoted">
 			<inp2:m_include t="in-bulletin/elements/side_boxes/poll_results.elm"/>
 			<div style="padding-top:5px; font-style: italic; font-weight: bold; text-align: center">
 				<inp2:m_phrase name="lu_text_AlreadyVoted"/>
 			</div>
 		<inp2:m_else/>
 			<ul style="list-style-type: none; padding-left: 0px;"><inp2:Field name="PollId" result_to_var="poll_id"/>
 				<inp2:poll-answer_PrintList list_name="list_answers" render_as="answer_element" direction="H" poll_id="$poll_id" requery="1"/>
 			</ul>
 			<div style="text-align: center; margin-top:8px; ">
 				<input type="hidden" id="selected_opt_<inp2:Field name="PollId"/>" name="selected_opt_<inp2:Field name="PollId"/>"/>
 				<input class="button" type="button" onclick="aPollManager.makeVote('poll', <inp2:Field name="PollId"/>, getElementById('selected_opt_<inp2:Field name="PollId"/>').value); return false;" value="<inp2:m_Phrase label="lu_btn_Vote"/>"/>
 			</div>
 		</inp2:m_if>
 	</inp2:m_if>
 	</div>
 
 	<!--## USER COMMENTS ##-->
 	<inp2:m_if check="Field" name="AllowComments">
 	<div style="text-align:center;">
 		<inp2:m_ifnot check="HasCommented">
 			<a href="<inp2:CommentsLink t="in-bulletin/elements/content_boxes/add_poll_comment.elm" height="480" width="480"/>" title="<inp2:Field name="Question"/>" class="thickbox"/><inp2:m_phrase name="lu_title_AddComment"/></a><br>
 		</inp2:m_ifnot>
-		<a href="<inp2:CommentsLink t="in-bulletin/elements/content_boxes/poll_comments.elm" height="480" width="480"/>" title="<inp2:Field name="Question"/>" class="thickbox"/><inp2:m_phrase name="lu_title_ViewUserComments"/></a>
+		<a href="<inp2:CommentsLink t="in-bulletin/elements/content_boxes/poll_comments.elm" height="480" width="480"/>" title="<inp2:Field name="Question"/>" class="thickbox"/><inp2:m_phrase name="lu_title_ViewComments"/></a>
 	</div>
 	</inp2:m_if>
 	<!--## //USER COMMENTS ##-->
 </div>
 </inp2:m_DefineElement>
 
 <div style="width:100%; text-align:center;">
 	<inp2:poll_PrintList list_name="list_polls" render_as="poll_element" direction="H"/>
 </div>
 <!-- //POllS -->
\ No newline at end of file
Index: branches/RC/themes/default2009/in-bulletin/elements/content_boxes/poll_comments.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-bulletin/elements/content_boxes/poll_comments.elm.tpl	(revision 11983)
+++ branches/RC/themes/default2009/in-bulletin/elements/content_boxes/poll_comments.elm.tpl	(revision 11984)
@@ -1,27 +1,27 @@
 <inp2:m_DefineElement name="content">
 
 		<inp2:m_DefineElement name="poll_comment_element">
 		<li style="margin-bottom: 10px;">
 			<inp2:Field name="CommentBody"/>
 			<inp2:Field name="CreatedOn"/>
 			<inp2:Field name="GuestEmail"/>
 			<inp2:Field name="GuestName"/>
 			<inp2:Field name="CreatedById"/>
 		</li>
 		</inp2:m_DefineElement>
 		<br/>
 
 		<inp2:poll-comment_InitList list_name="list_comments" direction="H" sort_by="CreatedOn,Desc" requery="1"/>
 
 		<inp2:m_if check="poll-comment_TotalRecords list_name="list_comments">
 			<ul>
 				<inp2:poll-comment_PrintList list_name="list_comments" render_as="poll_comment_element" direction="H"/>
 			</ul>
 		<inp2:m_else/>
 		<div align="center">
-			<a href="<inp2:poll_CommentsLink t="in-bulletin/elements/content_boxes/add_poll_comment.elm"/>?height=640&width=480" title="<inp2:poll_Field name="Question"/>" class="thickbox"><inp2:m_phrase name="lu_text_NoCommentsBeFirst"/></a>
+			<a href="<inp2:poll_CommentsLink t="in-bulletin/elements/content_boxes/add_poll_comment.elm"/>?height=640&width=480" title="<inp2:poll_Field name="Question"/>" class="thickbox"><inp2:m_phrase name="lu_text_NoComments"/></a>
 		</div>
 		</inp2:m_if>
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design_ajax.des" pass_params="1"/>
\ No newline at end of file
Index: branches/RC/themes/default2009/in-bulletin/elements/content_boxes/add_poll_comment.elm.tpl
===================================================================
--- branches/RC/themes/default2009/in-bulletin/elements/content_boxes/add_poll_comment.elm.tpl	(revision 11983)
+++ branches/RC/themes/default2009/in-bulletin/elements/content_boxes/add_poll_comment.elm.tpl	(revision 11984)
@@ -1,48 +1,48 @@
 <inp2:m_DefineElement name="content">
 	<inp2:poll-comment_PresetFormFields/>
 	<br/>
 	<form method="post" id="poll_comment_form" action="<inp2:m_Link height="480" width="480" pass="m,poll,poll-comment" poll-comment_event="OnCreate" />">
 	<table class="form-data fullwidth">
 		<inp2:m_ifnot check="m_LoggedIn">
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestName" title="lu_fld_YourName" style="width:200px"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestEmail" title="lu_fld_YourEmail" style="width:200px"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestName" title="lu_fld_Name" style="width:200px"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="poll-comment" field="GuestEmail" title="lu_fld_Email" style="width:200px"/>
 		</inp2:m_ifnot>
 		<inp2:m_RenderElement name="inp_edit_textarea" prefix="poll-comment" field="CommentBody" rows="8" cols="40" title="lu_fld_Comment" is_last="1"/>
 		<inp2:m_RenderElement design="inp_edit_buttons">
 			<input type="hidden" name="success_template" value="in-bulletin/elements/content_boxes/poll_comments.elm" />
 			<input class="button" id="add_comment_btn" type="button" name="events[poll-comment][OnCreate]" value="<inp2:m_phrase label="lu_btn_Create"/>" />
 			<input class="button" type="reset" name="reset" value="<inp2:m_phrase label="lu_btn_Reset"/>" />
 		</inp2:m_RenderElement>
 	</table>
 	</form>
 	<script language="javascript" type="text/javascript">
 	$(document).ready(
 		function() {
 			$('#add_comment_btn').click(
       			function ($e) {
 					TB.show(
 			          {
 			               url: $('#poll_comment_form').attr('action'),
 			               postParams: $('#poll_comment_form').serializeArray(),
 			               showCallback: function() {
     	                		var $match_redirect = new RegExp('^#redirect#(.*)').exec($('#TB_ajaxContent').html());
 							     if ($match_redirect != null) {
 							          // redirect to external template requested
 							          TB.show( {url: $match_redirect[1]+'&height=480&width=480'} );
 							          return true;
 							     }
 			          		}
 			          	}
 			     	);
       			}
 			)
 		}
 	);
 
 
 
 	</script>
 
 </inp2:m_DefineElement>
 
 <inp2:m_include template="platform/designs/default_design_ajax.des" pass_params="1"/>
\ No newline at end of file