Merge commit 'refs/merge-requests/159' of git://gitorious.org/statusnet/mainline...

[quix0rs-gnu-social.git] / actions / login.php

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