diff --git a/htdocs/cacher/edit.tpl.php b/htdocs/cacher/edit.tpl.php
index 5b1a265..317cf21 100644
--- a/htdocs/cacher/edit.tpl.php
+++ b/htdocs/cacher/edit.tpl.php
@@ -5,12 +5,12 @@ $h_value = htmlspecialchars($value);
 ?>
 <form method="post" action="">
 	<fieldset>
-		<legend><?php echo sprintf(_("Editing Variable %s"), $h_name); ?></legend>
+		<legend><?php echo sprintf(_T("Editing Variable %s"), $h_name); ?></legend>
 		<textarea name="value" style="width: 100%; height: 200px; overflow-y: auto" <?php echo $editable ? "" : "disabled=disabled"; ?>><?php echo $h_value; ?></textarea><br>
 		<input type="submit" <?php echo $editable ? "" : "disabled=disabled"; ?>>
 		<?php
 		if (!$editable) {
-			echo sprintf(_("Set %s in config to enable"), "\$config['enable_eval'] = true");
+			echo sprintf(_T("Set %s in config to enable"), "\$config['enable_eval'] = true");
 		}
 		?>
 	</fieldset>
diff --git a/htdocs/cacher/help.tpl.php b/htdocs/cacher/help.tpl.php
index 016f689..39982fa 100644
--- a/htdocs/cacher/help.tpl.php
+++ b/htdocs/cacher/help.tpl.php
@@ -3,7 +3,7 @@
 <?php if (ini_get("xcache.test")) { ?>
 <form method="post" action="">
 	<div>
-		<input type="submit" name="coredump" value="Test coredump" class="submit" onclick="return confirm('<?php echo _('Sure?'); ?>');" />
+		<input type="submit" name="coredump" value="Test coredump" class="submit" onclick="return confirm('<?php echo _T('Sure?'); ?>');" />
 	</div>
 </form>
 <?php } ?>
diff --git a/htdocs/cacher/index.php b/htdocs/cacher/index.php
index 8d316dc..d5e0aba 100644
--- a/htdocs/cacher/index.php
+++ b/htdocs/cacher/index.php
@@ -185,7 +185,7 @@ function getCacheInfos() // {{{
 
 	if ($phpCacheCount >= 2) {
 		$total['type'] = XC_TYPE_PHP;
-		$total['cache_name'] = _('Total');
+		$total['cache_name'] = _T('Total');
 		$total['cacheid'] = -1;
 		$total['gc'] = null;
 		$total['istotal'] = true;
@@ -211,7 +211,7 @@ function getCacheInfos() // {{{
 
 	if ($varCacheCount >= 2) {
 		$total['type'] = XC_TYPE_VAR;
-		$total['cache_name'] = _('Total');
+		$total['cache_name'] = _T('Total');
 		$total['cacheid'] = -1;
 		$total['gc'] = null;
 		$total['istotal'] = true;
@@ -285,10 +285,10 @@ if (!extension_loaded('XCache')) {
 }
 
 $doTypes = array(
-		'' => _('Summary'),
-		'listphp' => _('List PHP'),
-		'listvar' => _('List Var Data'),
-		'help' => _('Help'),
+		'' => _T('Summary'),
+		'listphp' => _T('List PHP'),
+		'listvar' => _T('List Var Data'),
+		'help' => _T('Help'),
 		);
 
 function processPOST() // {{{
diff --git a/htdocs/cacher/sub/entrylist.tpl.php b/htdocs/cacher/sub/entrylist.tpl.php
index 4178f06..0b99776 100644
--- a/htdocs/cacher/sub/entrylist.tpl.php
+++ b/htdocs/cacher/sub/entrylist.tpl.php
@@ -1,7 +1,7 @@
 <?php $cycleClass = new Cycle('class="col1"', 'class="col2"'); ?>
 <form action="" method="post">
 	<table cellspacing="0" cellpadding="4" class="cycles entries">
-		<caption><?php echo _("$typeName $listName"); ?></caption>
+		<caption><?php echo _T("$typeName $listName"); ?></caption>
 <?php
 
 echo <<<TR
@@ -141,7 +141,7 @@ TR;
 ?>
 	</table>
 <?php if (!$isphp && $listName == 'Deleted') { ?>
-	<input type="submit" value="<?php echo _("Remove Selected"); ?>">
+	<input type="submit" value="<?php echo _T("Remove Selected"); ?>">
 <?php } ?>
 </form>
 <?php
diff --git a/htdocs/cacher/sub/moduleinfo.tpl.php b/htdocs/cacher/sub/moduleinfo.tpl.php
index c124c83..8b6f364 100644
--- a/htdocs/cacher/sub/moduleinfo.tpl.php
+++ b/htdocs/cacher/sub/moduleinfo.tpl.php
@@ -1,2 +1,2 @@
-<h2><?php echo _("Module Info"); ?></h2>
+<h2><?php echo _T("Module Info"); ?></h2>
 <div class="phpinfo"><?php echo getModuleInfo(); ?></div>
diff --git a/htdocs/cacher/sub/summary.tpl.php b/htdocs/cacher/sub/summary.tpl.php
index 58db765..dba2297 100644
--- a/htdocs/cacher/sub/summary.tpl.php
+++ b/htdocs/cacher/sub/summary.tpl.php
@@ -1,6 +1,6 @@
 <?php $cycleClass = new Cycle('class="col1"', 'class="col2"'); ?>
 <table cellspacing="0" cellpadding="4" class="cycles caches">
-	<caption><?php echo _('Caches'); ?></caption>
+	<caption><?php echo _T('Caches'); ?></caption>
 	<tr>
 	<?php echo
 		th(N_("cache.cache"))
@@ -27,13 +27,13 @@
 	</tr>
 	<?php
 	$numkeys = explode(',', 'slots,size,avail,hits,updates,skips,ooms,errors,cached,deleted');
-	$l_clear = _('Clear');
-	$l_disabled = _('Disabled');
-	$l_disable = _('Disable');
-	$l_enable = _('Enable');
-	$l_compiling = _('Compiling');
-	$l_normal = _('Normal');
-	$l_confirm = _('Sure?');
+	$l_clear = _T('Clear');
+	$l_disabled = _T('Disabled');
+	$l_disable = _T('Disable');
+	$l_enable = _T('Enable');
+	$l_compiling = _T('Compiling');
+	$l_normal = _T('Normal');
+	$l_confirm = _T('Sure?');
 	foreach (getCacheInfos() as $i => $ci) {
 		$class = $cycleClass->next();
 		echo <<<TR
@@ -129,12 +129,12 @@ EOS;
 <?php } ?>
 </table>
 <div class="blockarea legends">
-	<div class="legendtitle"><?php echo _('Legends:'); ?></div>
+	<div class="legendtitle"><?php echo _T('Legends:'); ?></div>
 	<div class="legend pvalue">&nbsp;&nbsp;</div>
-	<div class="legendtitle"><?php echo _($config['percent_graph_type'] == 'free' ? '% Free' : '% Used'); ?></div>
+	<div class="legendtitle"><?php echo _T($config['percent_graph_type'] == 'free' ? '% Free' : '% Used'); ?></div>
 	<div class="legend" style="background: rgb(0,0,255)">&nbsp;&nbsp;</div>
-	<div class="legendtitle"><?php echo _($config['percent_graph_type'] == 'free' ? 'Free Blocks' : 'Used Blocks'); ?></div>
+	<div class="legendtitle"><?php echo _T($config['percent_graph_type'] == 'free' ? 'Free Blocks' : 'Used Blocks'); ?></div>
 	<div class="legend" style="background: rgb(255,0,0)">&nbsp;&nbsp;</div>
-	<div class="legendtitle"><?php echo _('Hits'); ?></div>
+	<div class="legendtitle"><?php echo _T('Hits'); ?></div>
 </div>
 <?php unset($cycleClass); ?>
diff --git a/htdocs/common/common.php b/htdocs/common/common.php
index aa30c0a..42a18a4 100644
--- a/htdocs/common/common.php
+++ b/htdocs/common/common.php
@@ -44,10 +44,10 @@ function mainnav()
 {
 	foreach (array(
 				"http://xcache.lighttpd.net/" => "XCache",
-				"http://xcache.lighttpd.net/wiki/DocTOC" => _("Document"),
-				"http://xcache.lighttpd.net/wiki/PhpIni" => _("INI Reference"),
-				"http://xcache.lighttpd.net/wiki/GetSupport" => _("Get Support"),
-				"https://groups.google.com/group/xcache/" => _("Discusson"),
+				"http://xcache.lighttpd.net/wiki/DocTOC" => _T("Document"),
+				"http://xcache.lighttpd.net/wiki/PhpIni" => _T("INI Reference"),
+				"http://xcache.lighttpd.net/wiki/GetSupport" => _T("Get Support"),
+				"https://groups.google.com/group/xcache/" => _T("Discusson"),
 				"http://www.php.net/" => "PHP",
 				"http://www.lighttpd.net/" => "Lighttpd",
 				) as $url => $title) {
@@ -138,7 +138,7 @@ function get_language_file($name)
 	return isset($file) ? $file : "$name-en.lang.php";
 }
 
-function _($str)
+function _T($str)
 {
 	if (isset($GLOBALS['strings'][$str])) {
 		return $GLOBALS['strings'][$str];
@@ -151,7 +151,7 @@ function _($str)
 
 function __($str)
 {
-	return _($str);
+	return _T($str);
 }
 
 function N_($str)
@@ -260,10 +260,10 @@ include get_language_file("../common/common");
 
 $modules = array();
 if (file_exists("../cacher/index.php")) {
-	$modules["cacher"] = _("Cacher");
+	$modules["cacher"] = _T("Cacher");
 }
 if (file_exists("../coverager/index.php")) {
-	$modules["coverager"] = _("Coverager");
+	$modules["coverager"] = _T("Coverager");
 }
 header("Cache-Control: no-cache, must-revalidate");
 header("Expires: Sat, 26 Jul 1997 05:00:00 GMT");
diff --git a/htdocs/coverager/coverager.tpl.php b/htdocs/coverager/coverager.tpl.php
index 8944f2e..8c51115 100644
--- a/htdocs/coverager/coverager.tpl.php
+++ b/htdocs/coverager/coverager.tpl.php
@@ -34,11 +34,11 @@ function dir_head()
 {
 	global $cycle;
 	$cycle = new Cycle('class="col1"', 'class="col2"');
-	$l_dir = _("Directory");
-	$l_per = _("Percent");
-	$l_hit = _("Hits");
-	$l_lns = _("Lines");
-	$l_tds = _("TODO");
+	$l_dir = _T("Directory");
+	$l_per = _T("Percent");
+	$l_hit = _T("Hits");
+	$l_lns = _T("Lines");
+	$l_tds = _T("TODO");
 	return <<<EOS
 <table cellpadding="2" cellspacing="0" border="0" class="cycles">
 	<tr>
@@ -96,10 +96,10 @@ function file_head()
 {
 	global $cycle;
 	$cycle = new Cycle('class="col1"', 'class="col2"');
-	$l_fil = _("File");
-	$l_per = _("Percent");
-	$l_hit = _("Hits");
-	$l_lns = _("Lines");
+	$l_fil = _T("File");
+	$l_per = _T("Percent");
+	$l_hit = _T("Hits");
+	$l_lns = _T("Lines");
 	return <<<EOS
 <table cellpadding="2" cellspacing="0" border="0" class="cycles">
 	<tr>
@@ -148,7 +148,7 @@ function file_foot()
 EOS;
 }
 
-$l_root = _("root");
+$l_root = _T("root");
 if ($action == 'dir') {
 	if (function_exists('ob_filter_path_nicer')) {
 		ob_start('ob_filter_path_nicer');