Merge remote-tracking branch 'gitorious/1.0.x' into 1.0.x

diff --git a/actions/all.php b/actions/all.php
index 8ee3ec3fa697dcb42890b38e285846f9d5f66d68..2e53691636d3361c3af73507c6769237243b847d 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -86,9 +86,12 @@ class AllAction extends ProfileAction
     {
         $user = common_current_user();
         if ($user->id == $this->user->id) {
+            // TRANS: Title of a user's own start page.
             return _('Home timeline');
         } else {
             $profile = $this->user->getProfile();
+            // TRANS: Title of another user's start page.
+            // TRANS: %s is the other user's name.
             return sprintf(_("%s's home timeline"), $profile->getBestName());
         }
     }

diff --git a/actions/login.php b/actions/login.php
index 55eccf4b2c676216f19b81b51a000143deff9127..f774a0ed80d1f11bc7f29a9b71b0a12abe45cbe2 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -228,7 +228,7 @@ class LoginAction extends Action
         $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         // TRANS: Field label on login page.
-        $this->input('nickname', _('Username or email'));
+        $this->input('nickname', _('Username or email address'));
         $this->elementEnd('li');
         $this->elementStart('li');
         // TRANS: Field label on login page.

diff --git a/lib/searchaction.php b/lib/searchaction.php
index fd5f0b3ff5890c4ebe7b89b07b5a76d9472afc7a..cc8966eeaed91800b83f2122e69532709e690a92 100644 (file)
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -129,21 +129,22 @@ class SearchAction extends Action
         $message = _("* Make sure all words are spelled correctly.
 * Try different keywords.
 * Try more general keywords.
-* Try fewer keywords.
-");
+* Try fewer keywords.");
+            $message .= "\n";
+
         if (!common_config('site', 'private')) {
             $qe = urlencode($q);
+            $message .= "\n";
             // Don't change these long strings to HEREDOC; xgettext won't pick them up.
             // TRANS: Standard search suggestions shown when a search does not give any results.
-            $message .= sprintf(_("
-You can also try your search on other engines:
+            $message .= sprintf(_("You can also try your search on other engines:
 
 * [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%site.server%%%%)
 * [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)
 * [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)
 * [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)
-* [Collecta](http://collecta.com/#q=%s)
-"), $qe, $qe, $qe, $qe, $qe);
+* [Collecta](http://collecta.com/#q=%s)"), $qe, $qe, $qe, $qe, $qe);
+            $message .= "\n";
         }
         $this->elementStart('div', 'help instructions');
         $this->raw(common_markup_to_html($message));

diff --git a/plugins/Directory/actions/groupdirectory.php b/plugins/Directory/actions/groupdirectory.php
index 9ae1bede7c8ffbbe4f9eb1eb49d9bf389567368b..b9ffee94e5c4171df8bb15cff4350abb99a6aed5 100644 (file)
--- a/plugins/Directory/actions/groupdirectory.php
+++ b/plugins/Directory/actions/groupdirectory.php
@@ -125,7 +125,7 @@ class GroupdirectoryAction extends Action
         return _m("After you join a group you can send messages to all other members\n".
                  "using the syntax \"!groupname\".\n\n".
                  "Browse groups, or search for groups on by their name, location or topic.\n".
-                 "Separate the terms by spaces; they must be three characters or more.\n");
+                 "Separate the terms by spaces; they must be three characters or more.") . "\n";
     }
 
     /**