summaryrefslogtreecommitdiff
path: root/actions/siteadminpanel.php
diff options
context:
space:
mode:
authorSarven Capadisli <csarven@status.net>2010-03-03 15:31:44 -0500
committerSarven Capadisli <csarven@status.net>2010-03-03 15:31:44 -0500
commit13713a09bbb2cac0c82c2d6602c8820662740218 (patch)
tree07402e6428664dea5b8c0b255e3b50eab0d63d13 /actions/siteadminpanel.php
parentd3c1888256e32495cb0db9065ff7a03e105299a3 (diff)
parentc7d390e4949b28c28c95375bfe4523de05af7808 (diff)
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
Diffstat (limited to 'actions/siteadminpanel.php')
-rw-r--r--actions/siteadminpanel.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index 8c8f8b374..4b29819b7 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -277,8 +277,8 @@ class SiteAdminPanelForm extends AdminForm
$this->unli();
$this->li();
- $this->out->dropdown('language', _('Language'),
- get_nice_language_list(), _('Default site language'),
+ $this->out->dropdown('language', _('Default language'),
+ get_nice_language_list(), _('Site language when autodetection from browser settings is not available'),
false, $this->value('language'));
$this->unli();