Index: aEvent/templates/_singleColumnTemplate_slot.php
===================================================================
--- aEvent/templates/_singleColumnTemplate_slot.php	(revision 3261)
+++ aEvent/templates/_singleColumnTemplate_slot.php	(working copy)
@@ -23,6 +23,6 @@
 		<?php echo $aEvent->getTextForArea('blog-body', $options['excerptLength']) ?>
 	</div>
 	<div class="a-blog-read-more">
-		<?php echo link_to('Read More', 'a_event_post', $aEvent, array('class' => 'a-blog-more')) ?>
+		<?php echo link_to(a_('Read More'), 'a_event_post', $aEvent, array('class' => 'a-blog-more')) ?>
 	</div>
 </div>
\ No newline at end of file
Index: aEvent/templates/_meta.php
===================================================================
--- aEvent/templates/_meta.php	(revision 3261)
+++ aEvent/templates/_meta.php	(working copy)
@@ -24,7 +24,7 @@
 
 	<?php /* Events generally don't display the author, but you can if necessary.  ?>
  	<li class="post-author">
-		<span class="a-blog-item-meta-label"><?php echo __('Posted By:', array(), 'apostrophe') ?></span>
+		<span class="a-blog-item-meta-label"><?php echo a_('Posted By:') ?></span>
 		<?php echo ($aEvent->getAuthor()->getName()) ? $aEvent->getAuthor()->getName() : $aEvent->getAuthor()  ?>
 	</li>   			
 	<?php //*/ ?>
Index: aEvent/templates/_calendar.php
===================================================================
--- aEvent/templates/_calendar.php	(revision 3261)
+++ aEvent/templates/_calendar.php	(working copy)
@@ -7,20 +7,25 @@
 		<th colspan="7">
 			<?php echo a_button(a_('Previous'), url_for(aUrl::addParams($filtersWithoutDate,$calendar['params']['prev'])), array('a-arrow-btn', 'icon', 'a-arrow-left', 'previous-month', 'alt')) ?>
 			<h4 class="title">
-				<a href="<?php echo url_for(aUrl::addParams($filtersWithoutDate, array('year' => $calendar['year'], 'month' => date('m', strtotime($calendar['month']))))) ?>"><?php echo $calendar['month'] ?></a>
+				<a href="<?php echo url_for(aUrl::addParams($filtersWithoutDate, array('year' => $calendar['year'], 'month' => date('m', strtotime($calendar['month']))))) ?>"><?php echo a_($calendar['month']) ?></a>
 				<a href="<?php echo url_for(aUrl::addParams($filtersWithoutDate, array('year' => $calendar['year'], 'month' => ''))) ?>"><?php echo $calendar['year'] ?></a>
 			</h4>
 			<?php echo a_button(a_('Next'), url_for(aUrl::addParams($filtersWithoutDate, $calendar['params']['next'])), array('a-arrow-btn', 'icon', 'a-arrow-right', 'next-month', 'alt')) ?>
 		</th>
 	</tr>
 	<tr class="days">
-		<th class="day sunday">Su</th>
-		<th class="day monday">M</th>
-		<th class="day tuesday">T</th>
-		<th class="day wedsnesday">W</th>
-		<th class="day thursday">Th</th>
-		<th class="day friday">F</th>
-		<th class="day saturday">S</th>																								
+<?php if (DATE_CALC_BEGIN_WEEKDAY==0): ?>
+		<th class="day sunday"><?php echo a_("Su"); ?></th>
+<?php endif; ?>
+		<th class="day monday"><?php echo a_("M"); ?></th>
+		<th class="day tuesday"><?php echo a_("T"); ?></th>
+		<th class="day wedsnesday"><?php echo a_("W"); ?></th>
+		<th class="day thursday"><?php echo a_("Th"); ?></th>
+		<th class="day friday"><?php echo a_("F"); ?></th>
+		<th class="day saturday"><?php echo a_("S"); ?></th>																								
+<?php if (DATE_CALC_BEGIN_WEEKDAY!=0): ?>
+		<th class="day sunday"><?php echo a_("Su"); ?></th>
+<?php endif; ?>
 	</tr>	
 	</thead>
 	<tbody>
@@ -47,7 +52,7 @@
 	<tfoot>
 		<tr>
 			<td colspan="7">
-				<a href="<?php echo url_for($filtersWithoutDate, array('year' => date('Y'), 'month' => date('m'), 'day' => date('d'))) ?>" class="icon a-events day-<?php echo date('d') ?> alt a-calendar-today"><span class="icon"></span>Today</a>
+				<a href="<?php echo url_for($filtersWithoutDate, array('year' => date('Y'), 'month' => date('m'), 'day' => date('d'))) ?>" class="icon a-events day-<?php echo date('d') ?> alt a-calendar-today"><span class="icon"></span><?php a_('Today'); ?></a>
 			</td>
 		</tr>
 	</tfoot>
Index: aBlog/templates/_sidebar.php
===================================================================
--- aBlog/templates/_sidebar.php	(revision 3261)
+++ aBlog/templates/_sidebar.php	(working copy)
@@ -52,15 +52,15 @@
     <div class="a-filter-option">
     	
 			<?php $selected_day = ($dateRange == 'day') ? $selected : array() ?>
-			<?php echo a_button('Day', url_for($url . '?'.http_build_query(($dateRange == 'day') ? $params['nodate'] : $params['day'])), array_merge(array('a-link'),$selected_day)) ?>
+			<?php echo a_button(a_('Day'), url_for($url . '?'.http_build_query(($dateRange == 'day') ? $params['nodate'] : $params['day'])), array_merge(array('a-link'),$selected_day)) ?>
 		</div>
     <div class="a-filter-option">
 			<?php $selected_month = ($dateRange == 'month') ? $selected : array() ?>
-			<?php echo a_button('Month', url_for($url . '?'.http_build_query(($dateRange == 'month') ? $params['nodate'] : $params['month'])), array_merge(array('a-link'),$selected_month)) ?>
+			<?php echo a_button(a_('Month'), url_for($url . '?'.http_build_query(($dateRange == 'month') ? $params['nodate'] : $params['month'])), array_merge(array('a-link'),$selected_month)) ?>
 		</div>
     <div class="a-filter-option">
 			<?php $selected_year = ($dateRange == 'year') ? $selected : array() ?>
-			<?php echo a_button('Year', url_for($url . '?'.http_build_query(($dateRange == 'year') ? $params['nodate'] : $params['year'])), array_merge(array('a-link'),$selected_year)) ?>
+			<?php echo a_button(a_('Year'), url_for($url . '?'.http_build_query(($dateRange == 'year') ? $params['nodate'] : $params['year'])), array_merge(array('a-link'),$selected_year)) ?>
 		</div>
   </div>
 </div>
Index: aBlog/templates/_twoColumnTemplate_slot.php
===================================================================
--- aBlog/templates/_twoColumnTemplate_slot.php	(revision 3261)
+++ aBlog/templates/_twoColumnTemplate_slot.php	(working copy)
@@ -13,7 +13,7 @@
 
 <ul class="a-blog-item-meta">
 	<li class="date"><?php echo aDate::long($aBlogPost['published_at']) ?></li>
-	<li class="author"><?php echo __('Posted By:', array(), 'apostrophe') ?> <?php echo $aBlogPost->getAuthor() ?></li>   			
+	<li class="author"><?php echo a_('Posted By:') ?> <?php echo $aBlogPost->getAuthor() ?></li>   			
 </ul>
 
 <?php if($options['maxImages'] && $aBlogPost->hasMedia()): ?>
Index: aBlog/templates/_meta.php
===================================================================
--- aBlog/templates/_meta.php	(revision 3261)
+++ aBlog/templates/_meta.php	(working copy)
@@ -1,7 +1,7 @@
 <ul class="a-blog-item-meta">
   <li class="post-date"><?php echo aDate::pretty($a_blog_post['published_at']); ?></li>
   <li class="post-author">
-			<span class="a-blog-item-meta-label"><?php echo __('Posted By:', array(), 'apostrophe') ?></span>
+			<span class="a-blog-item-meta-label"><?php echo a_('Posted By:') ?></span>
 			<?php echo ($a_blog_post->getAuthor()->getName()) ? $a_blog_post->getAuthor()->getName() : $a_blog_post->getAuthor()  ?>
 	</li>
 	<?php  if (sfConfig::get('app_aBlog_disqus_enabled')): ?>
Index: aEventSingleSlot/templates/_editView.php
===================================================================
--- aEventSingleSlot/templates/_editView.php	(revision 3261)
+++ aEventSingleSlot/templates/_editView.php	(working copy)
@@ -12,7 +12,7 @@
 <?php echo $form->renderHiddenFields() ?>
 
 <div class="a-form-row search">
-	<?php echo $form['search']->renderLabel(__('Search by Title', array(), 'apostrophe')) ?>
+	<?php echo $form['search']->renderLabel(a_('Search by Title')) ?>
 	<div class="a-form-field">
 		<?php echo $form['search']->render(array('class' => 'a-blogsingle-input', )) ?>
 		<div class="a-form-help"><?php echo $form['search']->renderHelp() ?></div>
Index: aBlogSingleSlot/templates/_editView.php
===================================================================
--- aBlogSingleSlot/templates/_editView.php	(revision 3261)
+++ aBlogSingleSlot/templates/_editView.php	(working copy)
@@ -12,7 +12,7 @@
 <?php echo $form->renderHiddenFields() ?>
 
 <div class="a-form-row search">
-	<?php echo $form['search']->renderLabel(__('Search by Title', array(), 'apostrophe')) ?>
+	<?php echo $form['search']->renderLabel(a_('Search by Title')) ?>
 	<div class="a-form-field">
 		<?php echo $form['search']->render(array('class' => 'a-blogsingle-input', )) ?>
 		<div class="a-form-help tooltip"><?php echo $form['search']->renderHelp() ?></div>
Index: aEventAdmin/templates/_form.php
===================================================================
--- aEventAdmin/templates/_form.php	(revision 3261)
+++ aEventAdmin/templates/_form.php	(working copy)
@@ -44,12 +44,12 @@
 <div class="event-date section a-form-row">
 
 	<div class="start_date">
-		<h4>Start Date</h4>
+		<h4><?php echo a_('Start Date'); ?></h4>
 		<div class="a-form-row all_day">
 			<div class="a-form-field">
 				<?php echo $form['all_day']->render() ?>
 			</div>
-			<?php echo $form['all_day']->renderLabel() ?>
+			<?php echo $form['all_day']->renderLabel(a_('All Day')) ?>
 			<?php echo $form['all_day']->renderError() ?>
 		</div>		
 		<?php echo $form['start_date']->render() ?>
@@ -64,7 +64,7 @@
 	</div>
 	
 	<div class="end_date">
-		<h4>End Date</h4>
+		<h4><?php echo a_('End Date'); ?></h4>
 		<?php echo $form['end_date']->render() ?>
 		<div class="end_time">
     	<?php echo $form['end_time'] ?>
Index: aEventAdmin/templates/_tagList.php
===================================================================
--- aEventAdmin/templates/_tagList.php	(revision 3261)
+++ aEventAdmin/templates/_tagList.php	(working copy)
@@ -5,7 +5,7 @@
   $tags = isset($tags) ? $sf_data->getRaw('tags') : null;
 ?>
 <div class="a-admin-form-field-tags">
-  <h5>Popular Tags</h5>
+  <h5><?php echo a_('Popular Tags'); ?></h5>
 
   <div id="blog-tag-list">
     <?php $n=1; foreach ($tags as $tag => $count): ?>
Index: aEventAdmin/templates/editSuccess.php
===================================================================
--- aEventAdmin/templates/editSuccess.php	(revision 3261)
+++ aEventAdmin/templates/editSuccess.php	(working copy)
@@ -26,7 +26,7 @@
 <?php slot('a-page-header') ?>
 <div class="a-ui a-admin-header">
 	<ul class="a-ui a-controls a-admin-controls">
-		<li><a href="<?php echo url_for('@a_event_admin'); ?>" class="a-btn big"><?php echo __('View All Events', array(), 'apostrophe') ?></a></li>
+		<li><a href="<?php echo url_for('@a_event_admin'); ?>" class="a-btn big"><?php echo a_('View All Events') ?></a></li>
      <?php include_partial('list_actions', array('helper' => $helper)) ?>
 	</ul>
   <?php include_partial('aEventAdmin/form_bar') ?>				
Index: aBlogAdmin/templates/_list_bar.php
===================================================================
--- aBlogAdmin/templates/_list_bar.php	(revision 3261)
+++ aBlogAdmin/templates/_list_bar.php	(working copy)
@@ -6,7 +6,7 @@
 ?>
 <div id="a-admin-bar" <?php if (count($sf_user->getAttribute('aBlogAdmin.filters', null, 'admin_module'))): ?>class="has-filters"<?php endif ?>>
   <?php if (0): ?>
-    <h2 class="a-admin-title you-are-here"><?php echo __('Blog Post Admin', array(), 'messages') ?></h2>
+    <h2 class="a-admin-title you-are-here"><?php echo a_('Blog Post Admin') ?></h2>
   <?php endif ?>
 </div>
 
Index: aBlogAdmin/templates/editSuccess.php
===================================================================
--- aBlogAdmin/templates/editSuccess.php	(revision 3261)
+++ aBlogAdmin/templates/editSuccess.php	(working copy)
@@ -26,7 +26,7 @@
 <?php slot('a-page-header') ?>
 <div class="a-ui a-admin-header">
 	<ul class="a-ui a-controls a-admin-controls">
-		<li><a href="<?php echo url_for('@a_blog_admin'); ?>" class="a-btn big"><?php echo __('View All Posts', array(), 'apostrophe') ?></a></li>
+		<li><a href="<?php echo url_for('@a_blog_admin'); ?>" class="a-btn big"><?php echo a_('View All Posts') ?></a></li>
      <?php include_partial('list_actions', array('helper' => $helper)) ?>
 	</ul>
   <?php include_partial('aBlogAdmin/form_bar') ?>