From 7e38142d4aa080767617724a98c0cf60c70961d0 Mon Sep 17 00:00:00 2001
From: Mike Cochrane <mikec@mikenz.geek.nz>
Date: Thu, 10 Jul 2008 00:51:26 -0400
Subject: Resolve conflicts and convert _t( to _( where it was introduced
 again.

darcs-hash:20080710045126-533db-ffd9bcfe1295b3a376579ed7cd2278d5597b1884.gz
---
 actions/register.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'actions/register.php')

diff --git a/actions/register.php b/actions/register.php
index 45446dce6..37e787c9d 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -66,7 +66,7 @@ class RegisterAction extends Action {
 		} else {
 			$user = $this->register_user($nickname, $password, $email);
 			if (!$user) {
-				$this->show_form(_t('Invalid username or password.'));
+				$this->show_form(_('Invalid username or password.'));
 				return;
 			}
 			# success!
-- 
cgit v1.2.3-54-g00ecf