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

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

diff --git a/actions/login.php b/actions/login.php
index 7ec9c321391d1ea04994266834948f0871a36ac1..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', _('Nickname'));
+        $this->input('nickname', _('Username or email address'));
         $this->elementEnd('li');
         $this->elementStart('li');
         // TRANS: Field label on login page.