From 9cac6413a342445a998773458b215d129c2be2d1 Mon Sep 17 00:00:00 2001
From: Ori Avtalion <ori@avtalion.name>
Date: Fri, 1 May 2009 07:11:28 -0400
Subject: Add s to user favorite notices

---
 actions/favoritesrss.php  | 2 +-
 actions/showfavorites.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'actions')

diff --git a/actions/favoritesrss.php b/actions/favoritesrss.php
index f85bf1b19..6b46b8dec 100644
--- a/actions/favoritesrss.php
+++ b/actions/favoritesrss.php
@@ -107,7 +107,7 @@ class FavoritesrssAction extends Rss10Action
         $c    = array('url' => common_local_url('favoritesrss',
                                         array('nickname' =>
                                         $user->nickname)),
-                   'title' => sprintf(_("%s favorite notices"), $user->nickname),
+                   'title' => sprintf(_("%s's favorite notices"), $user->nickname),
                    'link' => common_local_url('showfavorites',
                                         array('nickname' =>
                                         $user->nickname)),
diff --git a/actions/showfavorites.php b/actions/showfavorites.php
index 6e011d5ca..eed62a2ab 100644
--- a/actions/showfavorites.php
+++ b/actions/showfavorites.php
@@ -74,9 +74,9 @@ class ShowfavoritesAction extends Action
     function title()
     {
         if ($this->page == 1) {
-            return sprintf(_("%s favorite notices"), $this->user->nickname);
+            return sprintf(_("%s's favorite notices"), $this->user->nickname);
         } else {
-            return sprintf(_("%s favorite notices, page %d"),
+            return sprintf(_("%s's favorite notices, page %d"),
                            $this->user->nickname,
                            $this->page);
         }
-- 
cgit v1.2.3-54-g00ecf


From c5e72e248fa70b5e038c74b73b581884112706d5 Mon Sep 17 00:00:00 2001
From: Ori Avtalion <ori@avtalion.name>
Date: Fri, 1 May 2009 07:12:13 -0400
Subject: Several whitespace fixes

---
 actions/openidsettings.php  | 4 ++--
 actions/recoverpassword.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'actions')

diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 92469d20f..5f59ebc01 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -67,8 +67,8 @@ class OpenidsettingsAction extends AccountSettingsAction
 
     function getInstructions()
     {
-        return _('[OpenID](%%doc.openid%%) lets you log into many sites ' .
-                 ' with the same user account. '.
+        return _('[OpenID](%%doc.openid%%) lets you log into many sites' .
+                 ' with the same user account.'.
                  ' Manage your associated OpenIDs from here.');
     }
 
diff --git a/actions/recoverpassword.php b/actions/recoverpassword.php
index 620fe7eb8..82263fcd5 100644
--- a/actions/recoverpassword.php
+++ b/actions/recoverpassword.php
@@ -151,11 +151,11 @@ class RecoverpasswordAction extends Action
                 $this->element('p', null,
                                _('If you\'ve forgotten or lost your' .
                                  ' password, you can get a new one sent to' .
-                                 ' the email address you have stored ' .
+                                 ' the email address you have stored' .
                                  ' in your account.'));
             } else if ($this->mode == 'reset') {
                 $this->element('p', null,
-                               _('You\'ve been identified. Enter a ' .
+                               _('You\'ve been identified. Enter a' .
                                  ' new password below. '));
             }
             $this->elementEnd('div');
-- 
cgit v1.2.3-54-g00ecf