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
---
 lib/settingsaction.php | 4 ++--
 lib/stream.php         | 4 ++--
 lib/util.php           | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/settingsaction.php b/lib/settingsaction.php
index 22be36720..fe0f48a7a 100644
--- a/lib/settingsaction.php
+++ b/lib/settingsaction.php
@@ -100,8 +100,8 @@ class SettingsAction extends Action {
         common_element_start('ul', array('id' => 'nav_views'));
         foreach ($menu as $menuaction => $menudesc) {
             common_menu_item(common_local_url($menuaction),
-                    _t($menudesc[0]),
-                    _t($menudesc[1]),
+                    _($menudesc[0]),
+                    _($menudesc[1]),
                     $action == $menuaction);
         }
         common_element_end('ul');
diff --git a/lib/stream.php b/lib/stream.php
index d6180f4ed..ad65e2d2a 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -98,14 +98,14 @@ class StreamAction extends Action {
 			common_text(' (');
 			common_element('a', array('class' => 'inreplyto',
 									  'href' => $replyurl),
-						   _t(' in reply to...'));
+						   _('in reply to...'));
 			common_text(')');
 		}
 		common_element_start('a',
 							 array('href' => common_local_url('newnotice',
 															  array('replyto' => $profile->nickname)),
 								   'onclick' => 'doreply("'.$profile->nickname.'"); return false',
-								   'title' => _t('reply'),
+								   'title' => _('reply'),
 								   'class' => 'replybutton'));
 		common_raw('&rarr;');
 		common_element_end('a');
diff --git a/lib/util.php b/lib/util.php
index 1af5d1177..1d661fb4e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -277,7 +277,8 @@ function common_nav_menu() {
 		common_menu_item(common_local_url('all', array('nickname' => $user->nickname)),
 						 _('Home'));
 	}
-	common_menu_item(common_local_url('public'), _t('Public'));
+	common_menu_item(common_local_url('public'), _('Public'));
+	common_menu_item(common_local_url('peoplesearch'), _('Search'));
 	common_menu_item(common_local_url('doc', array('title' => 'help')),
 					 _('Help'));
 	if ($user) {
-- 
cgit v1.2.3-54-g00ecf