diff --git a/lib/Cake/View/Helper.php b/lib/Cake/View/Helper.php
index 448917f224c..91b017ba1b2 100644
--- a/lib/Cake/View/Helper.php
+++ b/lib/Cake/View/Helper.php
@@ -124,7 +124,7 @@ public function __construct(View $View, $settings = array()) {
  * @param array $params Array of params for the method.
  */
 	public function __call($method, $params) {
-		trigger_error(__('Method %1$s::%2$s does not exist', get_class($this), $method), E_USER_WARNING);
+		trigger_error(__d('cake', 'Method %1$s::%2$s does not exist', get_class($this), $method), E_USER_WARNING);
 	}
 
 /**
diff --git a/lib/Cake/View/Helper/FormHelper.php b/lib/Cake/View/Helper/FormHelper.php
index 17dd064c5d1..7a7ed9128dc 100644
--- a/lib/Cake/View/Helper/FormHelper.php
+++ b/lib/Cake/View/Helper/FormHelper.php
@@ -367,7 +367,7 @@ public function end($options = null) {
 				$submitOptions = $options;
 
 				if (!$submit) {
-					$submit = __('Submit');
+					$submit = __d('cake', 'Submit');
 				}
 			}
 			$out .= $this->submit($submit, $submitOptions);
@@ -509,7 +509,7 @@ public function error($field, $text = null, $options = array()) {
 			if ($text != null) {
 				$error = $text;
 			} elseif (is_numeric($error)) {
-				$error = __('Error in field %s', Inflector::humanize($this->field()));
+				$error = __d('cake', 'Error in field %s', Inflector::humanize($this->field()));
 			}
 			if ($options['escape']) {
 				$error = h($error);
@@ -552,7 +552,7 @@ function label($fieldName = null, $text = null, $options = array()) {
 			if (substr($text, -3) == '_id') {
 				$text = substr($text, 0, strlen($text) - 3);
 			}
-			$text = __(Inflector::humanize(Inflector::underscore($text)));
+			$text = __d('cake', Inflector::humanize(Inflector::underscore($text)));
 		}
 
 		if (is_string($options)) {
@@ -621,16 +621,16 @@ public function inputs($fields = null, $blacklist = null) {
 		}
 
 		if ($legend === true) {
-			$actionName = __('New %s');
+			$actionName = __d('cake', 'New %s');
 			$isEdit = (
 				strpos($this->request->params['action'], 'update') !== false ||
 				strpos($this->request->params['action'], 'edit') !== false
 			);
 			if ($isEdit) {
-				$actionName = __('Edit %s');
+				$actionName = __d('cake', 'Edit %s');
 			}
 			$modelName = Inflector::humanize(Inflector::underscore($model));
-			$legend = sprintf($actionName, __($modelName));
+			$legend = sprintf($actionName, __d('cake', $modelName));
 		}
 
 		$out = null;
@@ -1046,7 +1046,7 @@ public function radio($fieldName, $options = array(), $attributes = array()) {
 			$legend = $attributes['legend'];
 			unset($attributes['legend']);
 		} elseif (count($options) > 1) {
-			$legend = __(Inflector::humanize($this->field()));
+			$legend = __d('cake', Inflector::humanize($this->field()));
 		}
 		$label = true;
 
@@ -1131,7 +1131,7 @@ public function radio($fieldName, $options = array(), $attributes = array()) {
 	public function __call($method, $params) {
 		$options = array();
 		if (empty($params)) {
-			throw new CakeException(__('Missing field name for FormHelper::%s', $method));
+			throw new CakeException(__d('cake', 'Missing field name for FormHelper::%s', $method));
 		}
 		if (isset($params[1])) {
 			$options = $params[1];
@@ -1347,7 +1347,7 @@ public function postLink($title, $url = null, $options = array(), $confirmMessag
  */
 	public function submit($caption = null, $options = array()) {
 		if (!$caption) {
-			$caption = __('Submit');
+			$caption = __d('cake', 'Submit');
 		}
 		$out = null;
 		$div = true;
@@ -2139,18 +2139,18 @@ function __generateOptions($name, $options = array()) {
 			break;
 			case 'month':
 				if ($options['monthNames'] === true) {
-					$data['01'] = __('January');
-					$data['02'] = __('February');
-					$data['03'] = __('March');
-					$data['04'] = __('April');
-					$data['05'] = __('May');
-					$data['06'] = __('June');
-					$data['07'] = __('July');
-					$data['08'] = __('August');
-					$data['09'] = __('September');
-					$data['10'] = __('October');
-					$data['11'] = __('November');
-					$data['12'] = __('December');
+					$data['01'] = __d('cake', 'January');
+					$data['02'] = __d('cake', 'February');
+					$data['03'] = __d('cake', 'March');
+					$data['04'] = __d('cake', 'April');
+					$data['05'] = __d('cake', 'May');
+					$data['06'] = __d('cake', 'June');
+					$data['07'] = __d('cake', 'July');
+					$data['08'] = __d('cake', 'August');
+					$data['09'] = __d('cake', 'September');
+					$data['10'] = __d('cake', 'October');
+					$data['11'] = __d('cake', 'November');
+					$data['12'] = __d('cake', 'December');
 				} else if (is_array($options['monthNames'])) {
 					$data = $options['monthNames'];
 				} else {
diff --git a/lib/Cake/View/Helper/HtmlHelper.php b/lib/Cake/View/Helper/HtmlHelper.php
index 1f098864fe4..4925ba16fda 100644
--- a/lib/Cake/View/Helper/HtmlHelper.php
+++ b/lib/Cake/View/Helper/HtmlHelper.php
@@ -940,13 +940,13 @@ public function loadConfig($configFile, $path = CONFIGS) {
 				$reader = $configFile[1];
 			}
 		} else {
-			throw new ConfigureException(__('Cannot load the configuration file. Wrong "configFile" configuration.'));
+			throw new ConfigureException(__d('cake', 'Cannot load the configuration file. Wrong "configFile" configuration.'));
 		}
 
 		$readerClass = Inflector::camelize($reader) . 'Reader';
 		App::uses($readerClass, 'Configure');
 		if (!class_exists($readerClass)) {
-			throw new ConfigureException(__('Cannot load the configuration file. Unknown reader.'));
+			throw new ConfigureException(__d('cake', 'Cannot load the configuration file. Unknown reader.'));
 		}
 
 		$readerObj = new $readerClass($path);
diff --git a/lib/Cake/View/Helper/JsHelper.php b/lib/Cake/View/Helper/JsHelper.php
index 1495b72a6e5..d705ea7ef66 100644
--- a/lib/Cake/View/Helper/JsHelper.php
+++ b/lib/Cake/View/Helper/JsHelper.php
@@ -153,7 +153,7 @@ public function __call($method, $params) {
 		if (method_exists($this, $method . '_')) {
 			return call_user_func(array(&$this, $method . '_'), $params);
 		}
-		trigger_error(__('JsHelper:: Missing Method %s is undefined', $method), E_USER_WARNING);
+		trigger_error(__d('cake', 'JsHelper:: Missing Method %s is undefined', $method), E_USER_WARNING);
 	}
 
 /**
diff --git a/lib/Cake/View/Helper/MootoolsEngineHelper.php b/lib/Cake/View/Helper/MootoolsEngineHelper.php
index 37c61b6c929..13fb1bff4b5 100644
--- a/lib/Cake/View/Helper/MootoolsEngineHelper.php
+++ b/lib/Cake/View/Helper/MootoolsEngineHelper.php
@@ -307,7 +307,7 @@ function drag($options = array()) {
 	function drop($options = array()) {
 		if (empty($options['drag'])) {
 			trigger_error(
-				__('MootoolsEngine::drop() requires a "drag" option to properly function'), E_USER_WARNING
+				__d('cake', 'MootoolsEngine::drop() requires a "drag" option to properly function'), E_USER_WARNING
 			);
 			return false;
 		}
diff --git a/lib/Cake/View/Helper/NumberHelper.php b/lib/Cake/View/Helper/NumberHelper.php
index f2449a4eabc..fc5b35144f5 100644
--- a/lib/Cake/View/Helper/NumberHelper.php
+++ b/lib/Cake/View/Helper/NumberHelper.php
@@ -88,15 +88,15 @@ public function precision($number, $precision = 3) {
 	public function toReadableSize($size) {
 		switch (true) {
 			case $size < 1024:
-				return __n('%d Byte', '%d Bytes', $size, $size);
+				return __dn('cake', '%d Byte', '%d Bytes', $size, $size);
 			case round($size / 1024) < 1024:
-				return __('%d KB', $this->precision($size / 1024, 0));
+				return __d('cake', '%d KB', $this->precision($size / 1024, 0));
 			case round($size / 1024 / 1024, 2) < 1024:
-				return __('%.2f MB', $this->precision($size / 1024 / 1024, 2));
+				return __d('cake', '%.2f MB', $this->precision($size / 1024 / 1024, 2));
 			case round($size / 1024 / 1024 / 1024, 2) < 1024:
-				return __('%.2f GB', $this->precision($size / 1024 / 1024 / 1024, 2));
+				return __d('cake', '%.2f GB', $this->precision($size / 1024 / 1024 / 1024, 2));
 			default:
-				return __('%.2f TB', $this->precision($size / 1024 / 1024 / 1024 / 1024, 2));
+				return __d('cake', '%.2f TB', $this->precision($size / 1024 / 1024 / 1024 / 1024, 2));
 		}
 	}
 
diff --git a/lib/Cake/View/Helper/PaginatorHelper.php b/lib/Cake/View/Helper/PaginatorHelper.php
old mode 100755
new mode 100644
index eed163a957d..495d6402b38
--- a/lib/Cake/View/Helper/PaginatorHelper.php
+++ b/lib/Cake/View/Helper/PaginatorHelper.php
@@ -102,7 +102,7 @@ function __construct(View $View, $settings = array()) {
 		$classname = $ajaxProvider . 'Helper';
 		if (!method_exists($classname, 'link')) {
 			throw new CakeException(sprintf(
-				__('%s does not implement a link() method, it is incompatible with PaginatorHelper'), $classname
+				__d('cake', '%s does not implement a link() method, it is incompatible with PaginatorHelper'), $classname
 			));
 		}
 		parent::__construct($View, $settings);
@@ -306,7 +306,7 @@ public function sort($key, $title = null, $options = array()) {
 
 		if (empty($title)) {
 			$title = $key;
-			$title = __(Inflector::humanize(preg_replace('/_id$/', '', $title)));
+			$title = __d('cake', Inflector::humanize(preg_replace('/_id$/', '', $title)));
 		}
 		$dir = isset($options['direction']) ? $options['direction'] : 'asc';
 		unset($options['direction']);
@@ -553,7 +553,7 @@ public function counter($options = array()) {
 			array(
 				'model' => $this->defaultModel(),
 				'format' => 'pages',
-				'separator' => __(' of ')
+				'separator' => __d('cake', ' of ')
 			),
 		$options);
 
diff --git a/lib/Cake/View/Helper/TimeHelper.php b/lib/Cake/View/Helper/TimeHelper.php
index 269c4b9f009..3f149add4da 100644
--- a/lib/Cake/View/Helper/TimeHelper.php
+++ b/lib/Cake/View/Helper/TimeHelper.php
@@ -82,19 +82,19 @@ public function convertSpecifiers($format, $time = null) {
 	private function __translateSpecifier($specifier) {
 		switch ($specifier[1]) {
 			case 'a':
-				$abday = __c('abday', 5);
+				$abday = __cn('cake', 'abday', 5);
 				if (is_array($abday)) {
 					return $abday[date('w', $this->__time)];
 				}
 				break;
 			case 'A':
-				$day = __c('day', 5);
+				$day = __cn('cake', 'day', 5);
 				if (is_array($day)) {
 					return $day[date('w', $this->__time)];
 				}
 				break;
 			case 'c':
-				$format = __c('d_t_fmt', 5);
+				$format = __cn('cake', 'd_t_fmt', 5);
 				if ($format != 'd_t_fmt') {
 					return $this->convertSpecifiers($format, $this->__time);
 				}
@@ -116,13 +116,13 @@ private function __translateSpecifier($specifier) {
 				return date('jS', $this->__time);
 			case 'b':
 			case 'h':
-				$months = __c('abmon', 5);
+				$months = __cn('cake', 'abmon', 5);
 				if (is_array($months)) {
 					return $months[date('n', $this->__time) -1];
 				}
 				return '%b';
 			case 'B':
-				$months = __c('mon', 5);
+				$months = __cn('cake', 'mon', 5);
 				if (is_array($months)) {
 					return $months[date('n', $this->__time) -1];
 				}
@@ -133,14 +133,14 @@ private function __translateSpecifier($specifier) {
 			case 'P':
 				$default = array('am' => 0, 'pm' => 1);
 				$meridiem = $default[date('a',$this->__time)];
-				$format = __c('am_pm', 5);
+				$format = __cn('cake', 'am_pm', 5);
 				if (is_array($format)) {
 					$meridiem = $format[$meridiem];
 					return ($specifier[1] == 'P') ? strtolower($meridiem) : strtoupper($meridiem);
 				}
 				break;
 			case 'r':
-				$complete = __c('t_fmt_ampm', 5);
+				$complete = __cn('cake', 't_fmt_ampm', 5);
 				if ($complete != 't_fmt_ampm') {
 					return str_replace('%p',$this->__translateSpecifier(array('%p', 'p')),$complete);
 				}
@@ -154,13 +154,13 @@ private function __translateSpecifier($specifier) {
 			case 'u':
 				return ($weekDay = date('w', $this->__time)) ? $weekDay : 7;
 			case 'x':
-				$format = __c('d_fmt', 5);
+				$format = __cn('cake', 'd_fmt', 5);
 				if ($format != 'd_fmt') {
 					return $this->convertSpecifiers($format, $this->__time);
 				}
 				break;
 			case 'X':
-				$format = __c('t_fmt', 5);
+				$format = __cn('cake', 't_fmt', 5);
 				if ($format != 't_fmt') {
 					return $this->convertSpecifiers($format, $this->__time);
 				}
@@ -265,9 +265,9 @@ public function niceShort($dateString = null, $userOffset = null) {
 		$y = $this->isThisYear($date) ? '' : ' %Y';
 
 		if ($this->isToday($dateString, $userOffset)) {
-			$ret = __('Today, %s', strftime("%H:%M", $date));
+			$ret = __d('cake', 'Today, %s', strftime("%H:%M", $date));
 		} elseif ($this->wasYesterday($dateString, $userOffset)) {
-			$ret = __('Yesterday, %s', strftime("%H:%M", $date));
+			$ret = __d('cake', 'Yesterday, %s', strftime("%H:%M", $date));
 		} else {
 			$format = $this->convertSpecifiers("%b %eS{$y}, %H:%M", $date);
 			$ret = strftime($format, $date);
@@ -614,41 +614,41 @@ public function timeAgoInWords($dateTime, $options = array()) {
 		$diff = $futureTime - $pastTime;
 
 		if ($diff > abs($now - $this->fromString($end))) {
-			$relativeDate = __('on %s', date($format, $inSeconds));
+			$relativeDate = __d('cake', 'on %s', date($format, $inSeconds));
 		} else {
 			if ($years > 0) {
 				// years and months and days
-				$relativeDate .= ($relativeDate ? ', ' : '') . $years . ' ' . __n('year', 'years', $years);
-				$relativeDate .= $months > 0 ? ($relativeDate ? ', ' : '') . $months . ' ' . __n('month', 'months', $months) : '';
-				$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks) : '';
-				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days) : '';
+				$relativeDate .= ($relativeDate ? ', ' : '') . $years . ' ' . __dn('cake', 'year', 'years', $years);
+				$relativeDate .= $months > 0 ? ($relativeDate ? ', ' : '') . $months . ' ' . __dn('cake', 'month', 'months', $months) : '';
+				$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __dn('cake', 'week', 'weeks', $weeks) : '';
+				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __dn('cake', 'day', 'days', $days) : '';
 			} elseif (abs($months) > 0) {
 				// months, weeks and days
-				$relativeDate .= ($relativeDate ? ', ' : '') . $months . ' ' . __n('month', 'months', $months);
-				$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks) : '';
-				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days) : '';
+				$relativeDate .= ($relativeDate ? ', ' : '') . $months . ' ' . __dn('cake', 'month', 'months', $months);
+				$relativeDate .= $weeks > 0 ? ($relativeDate ? ', ' : '') . $weeks . ' ' . __dn('cake', 'week', 'weeks', $weeks) : '';
+				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __dn('cake', 'day', 'days', $days) : '';
 			} elseif (abs($weeks) > 0) {
 				// weeks and days
-				$relativeDate .= ($relativeDate ? ', ' : '') . $weeks . ' ' . __n('week', 'weeks', $weeks);
-				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days) : '';
+				$relativeDate .= ($relativeDate ? ', ' : '') . $weeks . ' ' . __dn('cake', 'week', 'weeks', $weeks);
+				$relativeDate .= $days > 0 ? ($relativeDate ? ', ' : '') . $days . ' ' . __dn('cake', 'day', 'days', $days) : '';
 			} elseif (abs($days) > 0) {
 				// days and hours
-				$relativeDate .= ($relativeDate ? ', ' : '') . $days . ' ' . __n('day', 'days', $days);
-				$relativeDate .= $hours > 0 ? ($relativeDate ? ', ' : '') . $hours . ' ' . __n('hour', 'hours', $hours) : '';
+				$relativeDate .= ($relativeDate ? ', ' : '') . $days . ' ' . __dn('cake', 'day', 'days', $days);
+				$relativeDate .= $hours > 0 ? ($relativeDate ? ', ' : '') . $hours . ' ' . __dn('cake', 'hour', 'hours', $hours) : '';
 			} elseif (abs($hours) > 0) {
 				// hours and minutes
-				$relativeDate .= ($relativeDate ? ', ' : '') . $hours . ' ' . __n('hour', 'hours', $hours);
-				$relativeDate .= $minutes > 0 ? ($relativeDate ? ', ' : '') . $minutes . ' ' . __n('minute', 'minutes', $minutes) : '';
+				$relativeDate .= ($relativeDate ? ', ' : '') . $hours . ' ' . __dn('cake', 'hour', 'hours', $hours);
+				$relativeDate .= $minutes > 0 ? ($relativeDate ? ', ' : '') . $minutes . ' ' . __dn('cake', 'minute', 'minutes', $minutes) : '';
 			} elseif (abs($minutes) > 0) {
 				// minutes only
-				$relativeDate .= ($relativeDate ? ', ' : '') . $minutes . ' ' . __n('minute', 'minutes', $minutes);
+				$relativeDate .= ($relativeDate ? ', ' : '') . $minutes . ' ' . __dn('cake', 'minute', 'minutes', $minutes);
 			} else {
 				// seconds only
-				$relativeDate .= ($relativeDate ? ', ' : '') . $seconds . ' ' . __n('second', 'seconds', $seconds);
+				$relativeDate .= ($relativeDate ? ', ' : '') . $seconds . ' ' . __dn('cake', 'second', 'seconds', $seconds);
 			}
 
 			if (!$backwards) {
-				$relativeDate = __('%s ago', $relativeDate);
+				$relativeDate = __d('cake', '%s ago', $relativeDate);
 			}
 		}
 		return $relativeDate;
@@ -668,7 +668,7 @@ public function timeAgoInWords($dateTime, $options = array()) {
 	public function wasWithinLast($timeInterval, $dateString, $userOffset = null) {
 		$tmp = str_replace(' ', '', $timeInterval);
 		if (is_numeric($tmp)) {
-			$timeInterval = $tmp . ' ' . __('days');
+			$timeInterval = $tmp . ' ' . __d('cake', 'days');
 		}
 
 		$date = $this->fromString($dateString, $userOffset);
diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php
index 26b9f2e35be..2f22dbb54af 100644
--- a/lib/Cake/View/View.php
+++ b/lib/Cake/View/View.php
@@ -396,7 +396,7 @@ public function render($view = null, $layout = null) {
 			$layout = $this->layout;
 		}
 		if ($this->output === false) {
-			throw new CakeException(__("Error in view %s, got no content.", $viewFileName));
+			throw new CakeException(__d('cake', "Error in view %s, got no content.", $viewFileName));
 		}
 		if ($layout && $this->autoLayout) {
 			$this->output = $this->renderLayout($this->output, $layout);
@@ -439,7 +439,7 @@ public function renderLayout($content_for_layout, $layout = null) {
 		$this->output = $this->_render($layoutFileName);
 
 		if ($this->output === false) {
-			throw new CakeException(__("Error in layout %s, got no content.", $layoutFileName));
+			throw new CakeException(__d('cake', "Error in layout %s, got no content.", $layoutFileName));
 		}
 
 		$this->Helpers->trigger('afterLayout', array($layoutFileName));
diff --git a/lib/Cake/View/errors/error400.ctp b/lib/Cake/View/errors/error400.ctp
index b6487ee91e5..bc861ca493d 100644
--- a/lib/Cake/View/errors/error400.ctp
+++ b/lib/Cake/View/errors/error400.ctp
@@ -18,9 +18,9 @@
 ?>
 <h2><?php echo $name; ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
 	<?php printf(
-		__('The requested address %s was not found on this server.'),
+		__d('cake', 'The requested address %s was not found on this server.'),
 		"<strong>'{$url}'</strong>"
 	); ?>
 </p>
diff --git a/lib/Cake/View/errors/error500.ctp b/lib/Cake/View/errors/error500.ctp
index f7b648ff6bf..ba0c41bea46 100644
--- a/lib/Cake/View/errors/error500.ctp
+++ b/lib/Cake/View/errors/error500.ctp
@@ -18,8 +18,8 @@
 ?>
 <h2><?php echo $name; ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('An Internal Error Has Occurred.'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'An Internal Error Has Occurred.'); ?>
 </p>
 <?php 
 if (Configure::read('debug') > 0 ):
diff --git a/lib/Cake/View/errors/missing_action.ctp b/lib/Cake/View/errors/missing_action.ctp
index 5b6fdb970e2..df8a7fc9fb6 100644
--- a/lib/Cake/View/errors/missing_action.ctp
+++ b/lib/Cake/View/errors/missing_action.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Method in %s', $controller); ?></h2>
+<h2><?php echo __d('cake', 'Missing Method in %s', $controller); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('The action %1$s is not defined in controller %2$s', '<em>' . $action . '</em>', '<em>' . $controller . '</em>'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'The action %1$s is not defined in controller %2$s', '<em>' . $action . '</em>', '<em>' . $controller . '</em>'); ?>
 </p>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Create %1$s%2$s in file: %3$s.', '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Create %1$s%2$s in file: %3$s.', '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
 </p>
 <pre>
 &lt;?php
@@ -38,7 +38,7 @@ class <?php echo $controller;?> extends AppController {
 ?&gt;
 </pre>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_action.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_action.ctp'); ?>
 </p>
 <?php echo $this->element('exception_stack_trace'); ?>
diff --git a/lib/Cake/View/errors/missing_behavior_class.ctp b/lib/Cake/View/errors/missing_behavior_class.ctp
index e7c45406954..cec3a107a16 100644
--- a/lib/Cake/View/errors/missing_behavior_class.ctp
+++ b/lib/Cake/View/errors/missing_behavior_class.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Behavior Class'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Behavior Class'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('The behavior class <em>%s</em> can not be found or does not exist.', $class); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'The behavior class <em>%s</em> can not be found or does not exist.', $class); ?>
 </p>
 <p  class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Create the class below in file: %s', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Create the class below in file: %s', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
 </p>
 <pre>
 &lt;?php
@@ -33,8 +33,8 @@ class <?php echo $class;?> extends ModelBehavior {
 ?&gt;
 </pre>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_class.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_class.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
diff --git a/lib/Cake/View/errors/missing_behavior_file.ctp b/lib/Cake/View/errors/missing_behavior_file.ctp
index 09e90b35055..ae04f123ffa 100644
--- a/lib/Cake/View/errors/missing_behavior_file.ctp
+++ b/lib/Cake/View/errors/missing_behavior_file.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Behavior File'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Behavior File'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('The Behavior file %s can not be found or does not exist.', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'The Behavior file %s can not be found or does not exist.', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
 </p>
 <p  class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Create the class below in file: %s', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Create the class below in file: %s', APP_DIR . DS . 'models' . DS . 'behaviors' . DS . $file); ?>
 </p>
 <pre>
 &lt;?php
@@ -33,8 +33,8 @@ class <?php echo $class;?> extends ModelBehavior {
 ?&gt;
 </pre>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_file.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_behavior_file.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
diff --git a/lib/Cake/View/errors/missing_component_class.ctp b/lib/Cake/View/errors/missing_component_class.ctp
index cf06671dcf8..674c0452412 100644
--- a/lib/Cake/View/errors/missing_component_class.ctp
+++ b/lib/Cake/View/errors/missing_component_class.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Component Class'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Component Class'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Component class %1$s was not found.', '<em>' . $class . '</em>'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Component class %1$s was not found.', '<em>' . $class . '</em>'); ?>
 </p>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Create the class %s in file: %s', '<em>' . $class . '</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Create the class %s in file: %s', '<em>' . $class . '</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
 </p>
 <pre>
 &lt;?php
@@ -33,8 +33,8 @@ class <?php echo $class;?> extends Component {<br />
 ?&gt;
 </pre>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_class.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_class.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/missing_component_file.ctp b/lib/Cake/View/errors/missing_component_file.ctp
index 527afc9c310..a39303ed023 100644
--- a/lib/Cake/View/errors/missing_component_file.ctp
+++ b/lib/Cake/View/errors/missing_component_file.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Component File'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Component File'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('The component file was not found.'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'The component file was not found.'); ?>
 </p>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Create the class %s in file: %s', '<em>' . $class . '</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Create the class %s in file: %s', '<em>' . $class . '</em>', APP_DIR . DS . 'controllers' . DS . 'components' . DS . $file); ?>
 </p>
 <pre>
 &lt;?php
@@ -33,8 +33,8 @@ class <?php echo $class;?> extends Component {<br />
 ?&gt;
 </pre>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_file.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_component_file.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/missing_connection.ctp b/lib/Cake/View/errors/missing_connection.ctp
index dfda66e3ab9..6f53202d7fa 100644
--- a/lib/Cake/View/errors/missing_connection.ctp
+++ b/lib/Cake/View/errors/missing_connection.ctp
@@ -16,18 +16,18 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Database Connection'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Database Connection'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('%s requires a database connection', $class); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', '%s requires a database connection', $class); ?>
 </p>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Confirm you have created the file : %s.', APP_DIR . DS . 'config' . DS . 'database.php'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Confirm you have created the file : %s.', APP_DIR . DS . 'config' . DS . 'database.php'); ?>
 </p>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s.', APP_DIR . DS . 'views' . DS . 'errors' . DS . basename(__FILE__)); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s.', APP_DIR . DS . 'views' . DS . 'errors' . DS . basename(__FILE__)); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/missing_controller.ctp b/lib/Cake/View/errors/missing_controller.ctp
index 7f9e7d27f1e..9919427ec18 100644
--- a/lib/Cake/View/errors/missing_controller.ctp
+++ b/lib/Cake/View/errors/missing_controller.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Controller'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Controller'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('%s could not be found.', '<em>' . $controller . '</em>'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', '%s could not be found.', '<em>' . $controller . '</em>'); ?>
 </p>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Create the class %s below in file: %s', '<em>' . $controller . '</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Create the class %s below in file: %s', '<em>' . $controller . '</em>', APP_DIR . DS . 'controllers' . DS . Inflector::underscore($controller) . '.php'); ?>
 </p>
 <pre>
 &lt;?php
@@ -33,8 +33,8 @@ class <?php echo $controller;?> extends AppController {
 ?&gt;
 </pre>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_controller.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_controller.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
diff --git a/lib/Cake/View/errors/missing_database.ctp b/lib/Cake/View/errors/missing_database.ctp
index 7aa2d5e802f..798bfa05d93 100644
--- a/lib/Cake/View/errors/missing_database.ctp
+++ b/lib/Cake/View/errors/missing_database.ctp
@@ -16,18 +16,18 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Database Connection'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Database Connection'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Scaffold requires a database connection'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Scaffold requires a database connection'); ?>
 </p>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Confirm you have created the file: %s', APP_DIR . DS . 'config' . DS . 'database.php'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Confirm you have created the file: %s', APP_DIR . DS . 'config' . DS . 'database.php'); ?>
 </p>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_scaffolddb.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_scaffolddb.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/missing_datasource_config.ctp b/lib/Cake/View/errors/missing_datasource_config.ctp
index 64c7d4c13df..51296083c42 100644
--- a/lib/Cake/View/errors/missing_datasource_config.ctp
+++ b/lib/Cake/View/errors/missing_datasource_config.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Datasource Configuration'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Datasource Configuration'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('The datasource configuration %1$s was not found in databases.php.', '<em>' . $config . '</em>'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'The datasource configuration %1$s was not found in databases.php.', '<em>' . $config . '</em>'); ?>
 </p>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_datasource_config.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_datasource_config.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/missing_datasource_file.ctp b/lib/Cake/View/errors/missing_datasource_file.ctp
index 0d53072fb05..452682655c2 100644
--- a/lib/Cake/View/errors/missing_datasource_file.ctp
+++ b/lib/Cake/View/errors/missing_datasource_file.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Datasource Class'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Datasource Class'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Datasource class %1$s was not found.', '<em>' . $class . '</em>'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Datasource class %1$s was not found.', '<em>' . $class . '</em>'); ?>
 </p>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_datasource_file.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_datasource_file.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/missing_helper_class.ctp b/lib/Cake/View/errors/missing_helper_class.ctp
index 842ded905af..58d07eb3e9d 100644
--- a/lib/Cake/View/errors/missing_helper_class.ctp
+++ b/lib/Cake/View/errors/missing_helper_class.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Helper Class'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Helper Class'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('The helper class <em>%s</em> can not be found or does not exist.', $class); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'The helper class <em>%s</em> can not be found or does not exist.', $class); ?>
 </p>
 <p  class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Create the class below in file: %s', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Create the class below in file: %s', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
 </p>
 <pre>
 &lt;?php
@@ -33,8 +33,8 @@ class <?php echo $class;?> extends AppHelper {
 ?&gt;
 </pre>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_class.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_class.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/missing_helper_file.ctp b/lib/Cake/View/errors/missing_helper_file.ctp
index 6ba0e9b6f4c..120cc3193be 100644
--- a/lib/Cake/View/errors/missing_helper_file.ctp
+++ b/lib/Cake/View/errors/missing_helper_file.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Helper File'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Helper File'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('The helper file %s can not be found or does not exist.', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'The helper file %s can not be found or does not exist.', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
 </p>
 <p  class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Create the class below in file: %s', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Create the class below in file: %s', APP_DIR . DS . 'views' . DS . 'helpers' . DS . $file); ?>
 </p>
 <pre>
 &lt;?php
@@ -33,8 +33,8 @@ class <?php echo $class;?> extends AppHelper {
 ?&gt;
 </pre>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_file.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_helper_file.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/missing_layout.ctp b/lib/Cake/View/errors/missing_layout.ctp
index 011e59a6436..d822390f665 100644
--- a/lib/Cake/View/errors/missing_layout.ctp
+++ b/lib/Cake/View/errors/missing_layout.ctp
@@ -16,18 +16,18 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Layout'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Layout'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('The layout file %s can not be found or does not exist.', '<em>' . $file . '</em>'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'The layout file %s can not be found or does not exist.', '<em>' . $file . '</em>'); ?>
 </p>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Confirm you have created the file: %s', '<em>' . $file . '</em>'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Confirm you have created the file: %s', '<em>' . $file . '</em>'); ?>
 </p>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_layout.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_layout.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/missing_table.ctp b/lib/Cake/View/errors/missing_table.ctp
index 1288dd06aa9..ac61366f109 100644
--- a/lib/Cake/View/errors/missing_table.ctp
+++ b/lib/Cake/View/errors/missing_table.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing Database Table'); ?></h2>
+<h2><?php echo __d('cake', 'Missing Database Table'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Database table %1$s for model %2$s was not found.', '<em>' . $table . '</em>',  '<em>' . $class . '</em>'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Database table %1$s for model %2$s was not found.', '<em>' . $table . '</em>',  '<em>' . $class . '</em>'); ?>
 </p>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_table.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_table.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/missing_view.ctp b/lib/Cake/View/errors/missing_view.ctp
index 9d8c7cb91ad..4a986b82334 100644
--- a/lib/Cake/View/errors/missing_view.ctp
+++ b/lib/Cake/View/errors/missing_view.ctp
@@ -16,18 +16,18 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Missing View'); ?></h2>
+<h2><?php echo __d('cake', 'Missing View'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('The view for %1$s%2$s was not found.', '<em>' . Inflector::camelize($this->request->controller) . 'Controller::</em>', '<em>' . $this->request->action . '()</em>'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'The view for %1$s%2$s was not found.', '<em>' . Inflector::camelize($this->request->controller) . 'Controller::</em>', '<em>' . $this->request->action . '()</em>'); ?>
 </p>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Confirm you have created the file: %s', $file); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Confirm you have created the file: %s', $file); ?>
 </p>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_view.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'missing_view.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/private_action.ctp b/lib/Cake/View/errors/private_action.ctp
index 833f4211262..c194ebe5803 100644
--- a/lib/Cake/View/errors/private_action.ctp
+++ b/lib/Cake/View/errors/private_action.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Private Method in %s', $controller); ?></h2>
+<h2><?php echo __d('cake', 'Private Method in %s', $controller); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('%s%s cannot be accessed directly.', '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', '%s%s cannot be accessed directly.', '<em>' . $controller . '::</em>', '<em>' . $action . '()</em>'); ?>
 </p>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'private_action.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'private_action.ctp'); ?>
 </p>
 
 <?php echo $this->element('exception_stack_trace'); ?>
\ No newline at end of file
diff --git a/lib/Cake/View/errors/scaffold_error.ctp b/lib/Cake/View/errors/scaffold_error.ctp
index 40f09c90a86..d2f9ae1e133 100644
--- a/lib/Cake/View/errors/scaffold_error.ctp
+++ b/lib/Cake/View/errors/scaffold_error.ctp
@@ -16,14 +16,14 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h2><?php echo __('Scaffold Error'); ?></h2>
+<h2><?php echo __d('cake', 'Scaffold Error'); ?></h2>
 <p class="error">
-	<strong><?php echo __('Error'); ?>: </strong>
-	<?php echo __('Method _scaffoldError in was not found in the controller'); ?>
+	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
+	<?php echo __d('cake', 'Method _scaffoldError in was not found in the controller'); ?>
 </p>
 <p class="notice">
-	<strong><?php echo __('Notice'); ?>: </strong>
-	<?php echo __('If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'scaffold_error.ctp'); ?>
+	<strong><?php echo __d('cake', 'Notice'); ?>: </strong>
+	<?php echo __d('cake', 'If you want to customize this error message, create %s', APP_DIR . DS . 'views' . DS . 'errors' . DS . 'scaffold_error.ctp'); ?>
 </p>
 <pre>
 &lt;?php
diff --git a/lib/Cake/View/layouts/default.ctp b/lib/Cake/View/layouts/default.ctp
index 5575c73290c..f758b955158 100644
--- a/lib/Cake/View/layouts/default.ctp
+++ b/lib/Cake/View/layouts/default.ctp
@@ -21,7 +21,7 @@
 <head>
 	<?php echo $this->Html->charset(); ?>
 	<title>
-		<?php echo __('CakePHP: the rapid development php framework:'); ?>
+		<?php echo __d('cake', 'CakePHP: the rapid development php framework:'); ?>
 		<?php echo $title_for_layout; ?>
 	</title>
 	<?php
@@ -35,7 +35,7 @@
 <body>
 	<div id="container">
 		<div id="header">
-			<h1><?php echo $this->Html->link(__('CakePHP: the rapid development php framework'), 'http://cakephp.org'); ?></h1>
+			<h1><?php echo $this->Html->link(__d('cake', 'CakePHP: the rapid development php framework'), 'http://cakephp.org'); ?></h1>
 		</div>
 		<div id="content">
 
@@ -46,7 +46,7 @@
 		</div>
 		<div id="footer">
 			<?php echo $this->Html->link(
-					$this->Html->image('cake.power.gif', array('alt'=> __('CakePHP: the rapid development php framework'), 'border' => '0')),
+					$this->Html->image('cake.power.gif', array('alt'=> __d('cake', 'CakePHP: the rapid development php framework'), 'border' => '0')),
 					'http://www.cakephp.org/',
 					array('target' => '_blank', 'escape' => false)
 				);
diff --git a/lib/Cake/View/pages/home.ctp b/lib/Cake/View/pages/home.ctp
index 4c51432de56..57a7e1cc1c6 100644
--- a/lib/Cake/View/pages/home.ctp
+++ b/lib/Cake/View/pages/home.ctp
@@ -20,8 +20,8 @@ if (Configure::read('debug') == 0):
 endif;
 App::import('Core', 'Debugger');
 ?>
-<h2><?php echo __('Release Notes for CakePHP %s.', Configure::version()); ?></h2>
-<a href="http://cakephp.org/changelogs/1.3.6"><?php __('Read the changelog'); ?> </a>
+<h2><?php echo __d('cake', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
+<a href="http://cakephp.org/changelogs/1.3.6"><?php __d('cake', 'Read the changelog'); ?> </a>
 <?php
 if (Configure::read('debug') > 0):
 	Debugger::checkSecurityKeys();
@@ -31,11 +31,11 @@ endif;
 	<?php
 		if (is_writable(TMP)):
 			echo '<span class="notice success">';
-				echo __('Your tmp directory is writable.');
+				echo __d('cake', 'Your tmp directory is writable.');
 			echo '</span>';
 		else:
 			echo '<span class="notice">';
-				echo __('Your tmp directory is NOT writable.');
+				echo __d('cake', 'Your tmp directory is NOT writable.');
 			echo '</span>';
 		endif;
 	?>
@@ -45,11 +45,11 @@ endif;
 		$settings = Cache::settings();
 		if (!empty($settings)):
 			echo '<span class="notice success">';
-				echo __('The %s is being used for caching. To change the config edit APP/config/core.php ', '<em>'. $settings['engine'] . 'Engine</em>');
+				echo __d('cake', 'The %s is being used for caching. To change the config edit APP/config/core.php ', '<em>'. $settings['engine'] . 'Engine</em>');
 			echo '</span>';
 		else:
 			echo '<span class="notice">';
-				echo __('Your cache is NOT working. Please check the settings in APP/config/core.php');
+				echo __d('cake', 'Your cache is NOT working. Please check the settings in APP/config/core.php');
 			echo '</span>';
 		endif;
 	?>
@@ -59,14 +59,14 @@ endif;
 		$filePresent = null;
 		if (file_exists(CONFIGS.'database.php')):
 			echo '<span class="notice success">';
-				echo __('Your database configuration file is present.');
+				echo __d('cake', 'Your database configuration file is present.');
 				$filePresent = true;
 			echo '</span>';
 		else:
 			echo '<span class="notice">';
-				echo __('Your database configuration file is NOT present.');
+				echo __d('cake', 'Your database configuration file is NOT present.');
 				echo '<br/>';
-				echo __('Rename config/database.php.default to config/database.php');
+				echo __d('cake', 'Rename config/database.php.default to config/database.php');
 			echo '</span>';
 		endif;
 	?>
@@ -75,9 +75,9 @@ endif;
 	App::uses('Validation', 'Utility');
 	if (!Validation::alphaNumeric('cakephp')) {
 		echo '<p><span class="notice">';
-		__('PCRE has not been compiled with Unicode support.');
+		__d('cake', 'PCRE has not been compiled with Unicode support.');
 		echo '<br/>';
-		__('Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
+		__d('cake', 'Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
 		echo '</span></p>';
 	}
 ?>
@@ -94,30 +94,30 @@ if (isset($filePresent)):
 	<?php
 		if ($connected && $connected->isConnected()):
 			echo '<span class="notice success">';
-	 			echo __('Cake is able to connect to the database.');
+	 			echo __d('cake', 'Cake is able to connect to the database.');
 			echo '</span>';
 		else:
 			echo '<span class="notice">';
-				echo __('Cake is NOT able to connect to the database.');
+				echo __d('cake', 'Cake is NOT able to connect to the database.');
 			echo '</span>';
 		endif;
 	?>
 </p>
 <?php endif;?>
-<h3><?php echo __('Editing this Page'); ?></h3>
+<h3><?php echo __d('cake', 'Editing this Page'); ?></h3>
 <p>
 <?php
-echo __('To change the content of this page, create: APP/views/pages/home.ctp.<br />
+echo __d('cake', 'To change the content of this page, create: APP/views/pages/home.ctp.<br />
 To change its layout, create: APP/views/layouts/default.ctp.<br />
 You can also add some CSS styles for your pages at: APP/webroot/css.');
 ?>
 </p>
 
-<h3><?php echo __('Getting Started'); ?></h3>
+<h3><?php echo __d('cake', 'Getting Started'); ?></h3>
 <p>
 	<?php
 		echo $this->Html->link(
-			sprintf('<strong>%s</strong> %s', __('New'), __('CakePHP 1.3 Docs')),
+			sprintf('<strong>%s</strong> %s', __d('cake', 'New'), __d('cake', 'CakePHP 1.3 Docs')),
 			'http://book.cakephp.org/view/875/x1-3-Collection',
 			array('target' => '_blank', 'escape' => false)
 		);
@@ -126,46 +126,46 @@ You can also add some CSS styles for your pages at: APP/webroot/css.');
 <p>
 	<?php
 		echo $this->Html->link(
-			__('The 15 min Blog Tutorial'),
+			__d('cake', 'The 15 min Blog Tutorial'),
 			'http://book.cakephp.org/view/1528/Blog',
 			array('target' => '_blank', 'escape' => false)
 		);
 	?>
 </p>
 
-<h3><?php echo __('More about Cake'); ?></h3>
+<h3><?php echo __d('cake', 'More about Cake'); ?></h3>
 <p>
-<?php echo __('CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
+<?php echo __d('cake', 'CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
 </p>
 <p>
-<?php echo __('Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
+<?php echo __d('cake', 'Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
 </p>
 
 <ul>
-	<li><a href="http://cakefoundation.org/"><?php echo __('Cake Software Foundation'); ?> </a>
-	<ul><li><?php echo __('Promoting development related to CakePHP'); ?></li></ul></li>
-	<li><a href="http://www.cakephp.org"><?php echo __('CakePHP'); ?> </a>
-	<ul><li><?php echo __('The Rapid Development Framework'); ?></li></ul></li>
-	<li><a href="http://book.cakephp.org"><?php echo __('CakePHP Documentation'); ?> </a>
-	<ul><li><?php echo __('Your Rapid Development Cookbook'); ?></li></ul></li>
-	<li><a href="http://api.cakephp.org"><?php echo __('CakePHP API'); ?> </a>
-	<ul><li><?php echo __('Quick Reference'); ?></li></ul></li>
-	<li><a href="http://bakery.cakephp.org"><?php echo __('The Bakery'); ?> </a>
-	<ul><li><?php echo __('Everything CakePHP'); ?></li></ul></li>
-	<li><a href="http://live.cakephp.org"><?php echo __('The Show'); ?> </a>
-	<ul><li><?php echo __('The Show is a live and archived internet radio broadcast CakePHP-related topics and answer questions live via IRC, Skype, and telephone.'); ?></li></ul></li>
-	<li><a href="http://groups.google.com/group/cake-php"><?php echo __('CakePHP Google Group'); ?> </a>
-	<ul><li><?php echo __('Community mailing list'); ?></li></ul></li>
+	<li><a href="http://cakefoundation.org/"><?php echo __d('cake', 'Cake Software Foundation'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Promoting development related to CakePHP'); ?></li></ul></li>
+	<li><a href="http://www.cakephp.org"><?php echo __d('cake', 'CakePHP'); ?> </a>
+	<ul><li><?php echo __d('cake', 'The Rapid Development Framework'); ?></li></ul></li>
+	<li><a href="http://book.cakephp.org"><?php echo __d('cake', 'CakePHP Documentation'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Your Rapid Development Cookbook'); ?></li></ul></li>
+	<li><a href="http://api.cakephp.org"><?php echo __d('cake', 'CakePHP API'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Quick Reference'); ?></li></ul></li>
+	<li><a href="http://bakery.cakephp.org"><?php echo __d('cake', 'The Bakery'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Everything CakePHP'); ?></li></ul></li>
+	<li><a href="http://live.cakephp.org"><?php echo __d('cake', 'The Show'); ?> </a>
+	<ul><li><?php echo __d('cake', 'The Show is a live and archived internet radio broadcast CakePHP-related topics and answer questions live via IRC, Skype, and telephone.'); ?></li></ul></li>
+	<li><a href="http://groups.google.com/group/cake-php"><?php echo __d('cake', 'CakePHP Google Group'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Community mailing list'); ?></li></ul></li>
 	<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
-	<ul><li><?php echo __('Live chat about CakePHP'); ?></li></ul></li>
-	<li><a href="http://github.com/cakephp/"><?php echo __('CakePHP Code'); ?> </a>
-	<ul><li><?php echo __('For the Development of CakePHP Git repository, Downloads'); ?></li></ul></li>
-	<li><a href="http://cakephp.lighthouseapp.com/"><?php echo __('CakePHP Lighthouse'); ?> </a>
-	<ul><li><?php echo __('CakePHP Tickets, Wiki pages, Roadmap'); ?></li></ul></li>
-	<li><a href="http://www.cakeforge.org"><?php echo __('CakeForge'); ?> </a>
-	<ul><li><?php echo __('Open Development for CakePHP'); ?></li></ul></li>
-	<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php echo __('Book Store'); ?> </a>
-	<ul><li><?php echo __('Recommended Software Books'); ?></li></ul></li>
-	<li><a href="http://www.cafepress.com/cakefoundation"><?php echo __('CakePHP gear'); ?> </a>
-	<ul><li><?php echo __('Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
+	<ul><li><?php echo __d('cake', 'Live chat about CakePHP'); ?></li></ul></li>
+	<li><a href="http://github.com/cakephp/"><?php echo __d('cake', 'CakePHP Code'); ?> </a>
+	<ul><li><?php echo __d('cake', 'For the Development of CakePHP Git repository, Downloads'); ?></li></ul></li>
+	<li><a href="http://cakephp.lighthouseapp.com/"><?php echo __d('cake', 'CakePHP Lighthouse'); ?> </a>
+	<ul><li><?php echo __d('cake', 'CakePHP Tickets, Wiki pages, Roadmap'); ?></li></ul></li>
+	<li><a href="http://www.cakeforge.org"><?php echo __d('cake', 'CakeForge'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Open Development for CakePHP'); ?></li></ul></li>
+	<li><a href="http://astore.amazon.com/cakesoftwaref-20/"><?php echo __d('cake', 'Book Store'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Recommended Software Books'); ?></li></ul></li>
+	<li><a href="http://www.cafepress.com/cakefoundation"><?php echo __d('cake', 'CakePHP gear'); ?> </a>
+	<ul><li><?php echo __d('cake', 'Get your own CakePHP gear - Doughnate to Cake'); ?></li></ul></li>
 </ul>
diff --git a/lib/Cake/View/scaffolds/form.ctp b/lib/Cake/View/scaffolds/form.ctp
index 1a3992e38d7..c738d07b6bf 100644
--- a/lib/Cake/View/scaffolds/form.ctp
+++ b/lib/Cake/View/scaffolds/form.ctp
@@ -20,28 +20,28 @@
 <?php
 	echo $this->Form->create();
 	echo $this->Form->inputs($scaffoldFields, array('created', 'modified', 'updated'));
-	echo $this->Form->end(__('Submit'));
+	echo $this->Form->end(__d('cake', 'Submit'));
 ?>
 </div>
 <div class="actions">
-	<h3><?php echo __('Actions'); ?></h3>
+	<h3><?php echo __d('cake', 'Actions'); ?></h3>
 	<ul>
 <?php if ($this->request->action != 'add'): ?>
 		<li><?php echo $this->Form->postLink(
-			__('Delete'),
+			__d('cake', 'Delete'),
 			array('action' => 'delete', $this->Form->value($modelClass . '.' . $primaryKey)),
 			null,
-			__('Are you sure you want to delete # %s?', $this->Form->value($modelClass . '.' . $primaryKey)));
+			__d('cake', 'Are you sure you want to delete # %s?', $this->Form->value($modelClass . '.' . $primaryKey)));
 		?></li>
 <?php endif;?>
-		<li><?php echo $this->Html->link(__('List') . ' ' . $pluralHumanName, array('action' => 'index'));?></li>
+		<li><?php echo $this->Html->link(__d('cake', 'List') . ' ' . $pluralHumanName, array('action' => 'index'));?></li>
 <?php
 		$done = array();
 		foreach ($associations as $_type => $_data) {
 			foreach ($_data as $_alias => $_details) {
 				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-					echo "\t\t<li>" . $this->Html->link(__('List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "</li>\n";
-					echo "\t\t<li>" . $this->Html->link(__('New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "</li>\n";
+					echo "\t\t<li>" . $this->Html->link(__d('cake', 'List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' =>'index')) . "</li>\n";
+					echo "\t\t<li>" . $this->Html->link(__d('cake', 'New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' =>'add')) . "</li>\n";
 					$done[] = $_details['controller'];
 				}
 			}
diff --git a/lib/Cake/View/scaffolds/index.ctp b/lib/Cake/View/scaffolds/index.ctp
index c3da1d4d8c7..d0def968e9b 100644
--- a/lib/Cake/View/scaffolds/index.ctp
+++ b/lib/Cake/View/scaffolds/index.ctp
@@ -23,7 +23,7 @@
 <?php foreach ($scaffoldFields as $_field):?>
 	<th><?php echo $this->Paginator->sort($_field);?></th>
 <?php endforeach;?>
-	<th><?php echo __('Actions');?></th>
+	<th><?php echo __d('cake', 'Actions');?></th>
 </tr>
 <?php
 $i = 0;
@@ -50,13 +50,13 @@ foreach (${$pluralVar} as ${$singularVar}):
 		}
 
 		echo '<td class="actions">';
-		echo $this->Html->link(__('View'), array('action' => 'view', ${$singularVar}[$modelClass][$primaryKey]));
-		echo $this->Html->link(__('Edit'), array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey]));
+		echo $this->Html->link(__d('cake', 'View'), array('action' => 'view', ${$singularVar}[$modelClass][$primaryKey]));
+		echo $this->Html->link(__d('cake', 'Edit'), array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey]));
 		echo $this->Form->postLink(
-			__('Delete'), 
+			__d('cake', 'Delete'), 
 			array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), 
 			null,
-			__('Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey]
+			__d('cake', 'Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey]
 		);
 		echo '</td>';
 	echo '</tr>';
@@ -67,26 +67,26 @@ endforeach;
 </table>
 	<p><?php
 	echo $this->Paginator->counter(array(
-		'format' => __('Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%')
+		'format' => __d('cake', 'Page %page% of %pages%, showing %current% records out of %count% total, starting on record %start%, ending on %end%')
 	));
 	?></p>
 	<div class="paging">
-	<?php echo $this->Paginator->prev('<< ' . __('previous'), array(), null, array('class' => 'disabled')); ?>
+	<?php echo $this->Paginator->prev('<< ' . __d('cake', 'previous'), array(), null, array('class' => 'disabled')); ?>
 	 | <?php echo $this->Paginator->numbers(); ?>
-	<?php echo $this->Paginator->next(__('next') .' >>', array(), null, array('class' => 'disabled')); ?>
+	<?php echo $this->Paginator->next(__d('cake', 'next') .' >>', array(), null, array('class' => 'disabled')); ?>
 	</div>
 </div>
 <div class="actions">
-	<h3><?php echo __('Actions'); ?></h3>
+	<h3><?php echo __d('cake', 'Actions'); ?></h3>
 	<ul>
-		<li><?php echo $this->Html->link(__('New %s', $singularHumanName), array('action' => 'add')); ?></li>
+		<li><?php echo $this->Html->link(__d('cake', 'New %s', $singularHumanName), array('action' => 'add')); ?></li>
 <?php
 		$done = array();
 		foreach ($associations as $_type => $_data) {
 			foreach ($_data as $_alias => $_details) {
 				if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-					echo "<li>" . $this->Html->link(__('List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "</li>";
-					echo "<li>" . $this->Html->link(__('New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "</li>";
+					echo "<li>" . $this->Html->link(__d('cake', 'List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "</li>";
+					echo "<li>" . $this->Html->link(__d('cake', 'New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "</li>";
 					$done[] = $_details['controller'];
 				}
 			}
diff --git a/lib/Cake/View/scaffolds/view.ctp b/lib/Cake/View/scaffolds/view.ctp
index 010450a151b..ef2fe7006d6 100644
--- a/lib/Cake/View/scaffolds/view.ctp
+++ b/lib/Cake/View/scaffolds/view.ctp
@@ -17,7 +17,7 @@
  */
 ?>
 <div class="<?php echo $pluralVar;?> view">
-<h2><?php echo __('View %s', $singularHumanName); ?></h2>
+<h2><?php echo __d('cake', 'View %s', $singularHumanName); ?></h2>
 	<dl>
 <?php
 $i = 0;
@@ -46,20 +46,20 @@ foreach ($scaffoldFields as $_field) {
 	</dl>
 </div>
 <div class="actions">
-	<h3><?php echo __('Actions'); ?></h3>
+	<h3><?php echo __d('cake', 'Actions'); ?></h3>
 	<ul>
 <?php
-	echo "\t\t<li>" .$this->Html->link(__('Edit %s', $singularHumanName),   array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])). " </li>\n";
-	echo "\t\t<li>" .$this->Html->link(__('Delete %s', $singularHumanName), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __('Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey] . '?'). " </li>\n";
-	echo "\t\t<li>" .$this->Html->link(__('List %s', $pluralHumanName), array('action' => 'index')). " </li>\n";
-	echo "\t\t<li>" .$this->Html->link(__('New %s', $singularHumanName), array('action' => 'add')). " </li>\n";
+	echo "\t\t<li>" .$this->Html->link(__d('cake', 'Edit %s', $singularHumanName),   array('action' => 'edit', ${$singularVar}[$modelClass][$primaryKey])). " </li>\n";
+	echo "\t\t<li>" .$this->Html->link(__d('cake', 'Delete %s', $singularHumanName), array('action' => 'delete', ${$singularVar}[$modelClass][$primaryKey]), null, __d('cake', 'Are you sure you want to delete').' #' . ${$singularVar}[$modelClass][$primaryKey] . '?'). " </li>\n";
+	echo "\t\t<li>" .$this->Html->link(__d('cake', 'List %s', $pluralHumanName), array('action' => 'index')). " </li>\n";
+	echo "\t\t<li>" .$this->Html->link(__d('cake', 'New %s', $singularHumanName), array('action' => 'add')). " </li>\n";
 
 	$done = array();
 	foreach ($associations as $_type => $_data) {
 		foreach ($_data as $_alias => $_details) {
 			if ($_details['controller'] != $this->name && !in_array($_details['controller'], $done)) {
-				echo "\t\t<li>" . $this->Html->link(__('List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "</li>\n";
-				echo "\t\t<li>" . $this->Html->link(__('New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "</li>\n";
+				echo "\t\t<li>" . $this->Html->link(__d('cake', 'List %s', Inflector::humanize($_details['controller'])), array('controller' => $_details['controller'], 'action' => 'index')) . "</li>\n";
+				echo "\t\t<li>" . $this->Html->link(__d('cake', 'New %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add')) . "</li>\n";
 				$done[] = $_details['controller'];
 			}
 		}
@@ -71,7 +71,7 @@ foreach ($scaffoldFields as $_field) {
 if (!empty($associations['hasOne'])) :
 foreach ($associations['hasOne'] as $_alias => $_details): ?>
 <div class="related">
-	<h3><?php echo __("Related %s", Inflector::humanize($_details['controller'])); ?></h3>
+	<h3><?php echo __d('cake', "Related %s", Inflector::humanize($_details['controller'])); ?></h3>
 <?php if (!empty(${$singularVar}[$_alias])):?>
 	<dl>
 <?php
@@ -90,7 +90,7 @@ foreach ($associations['hasOne'] as $_alias => $_details): ?>
 <?php endif; ?>
 	<div class="actions">
 		<ul>
-			<li><?php echo $this->Html->link(__('Edit %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'edit', ${$singularVar}[$_alias][$_details['primaryKey']]))."</li>\n";?>
+			<li><?php echo $this->Html->link(__d('cake', 'Edit %s', Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'edit', ${$singularVar}[$_alias][$_details['primaryKey']]))."</li>\n";?>
 		</ul>
 	</div>
 </div>
@@ -110,7 +110,7 @@ foreach ($relations as $_alias => $_details):
 $otherSingularVar = Inflector::variable($_alias);
 ?>
 <div class="related">
-	<h3><?php echo __("Related %s", Inflector::humanize($_details['controller'])); ?></h3>
+	<h3><?php echo __d('cake', "Related %s", Inflector::humanize($_details['controller'])); ?></h3>
 <?php if (!empty(${$singularVar}[$_alias])):?>
 	<table cellpadding="0" cellspacing="0">
 	<tr>
@@ -140,9 +140,9 @@ $otherSingularVar = Inflector::variable($_alias);
 			}
 
 			echo "\t\t\t<td class=\"actions\">\n";
-			echo "\t\t\t\t" . $this->Html->link(__('View'), array('controller' => $_details['controller'], 'action' => 'view', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
-			echo "\t\t\t\t" . $this->Html->link(__('Edit'), array('controller' => $_details['controller'], 'action' => 'edit', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
-			echo "\t\t\t\t" . $this->Html->link(__('Delete'), array('controller' => $_details['controller'], 'action' => 'delete', ${$otherSingularVar}[$_details['primaryKey']]), null, __('Are you sure you want to delete', true).' #' . ${$otherSingularVar}[$_details['primaryKey']] . '?'). "\n";
+			echo "\t\t\t\t" . $this->Html->link(__d('cake', 'View'), array('controller' => $_details['controller'], 'action' => 'view', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
+			echo "\t\t\t\t" . $this->Html->link(__d('cake', 'Edit'), array('controller' => $_details['controller'], 'action' => 'edit', ${$otherSingularVar}[$_details['primaryKey']])). "\n";
+			echo "\t\t\t\t" . $this->Html->link(__d('cake', 'Delete'), array('controller' => $_details['controller'], 'action' => 'delete', ${$otherSingularVar}[$_details['primaryKey']]), null, __d('cake', 'Are you sure you want to delete', true).' #' . ${$otherSingularVar}[$_details['primaryKey']] . '?'). "\n";
 			echo "\t\t\t</td>\n";
 		echo "\t\t</tr>\n";
 		endforeach;
@@ -151,7 +151,7 @@ $otherSingularVar = Inflector::variable($_alias);
 <?php endif; ?>
 	<div class="actions">
 		<ul>
-			<li><?php echo $this->Html->link(__("New %s", Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add'));?> </li>
+			<li><?php echo $this->Html->link(__d('cake', "New %s", Inflector::humanize(Inflector::underscore($_alias))), array('controller' => $_details['controller'], 'action' => 'add'));?> </li>
 		</ul>
 	</div>
 </div>