summaryrefslogtreecommitdiff
path: root/actions/imsettings.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-01-10 14:18:54 -0800
committerEvan Prodromou <evan@status.net>2010-01-10 14:18:54 -0800
commit15b88697a7c182faead1bbddfe38b59fdc54a0a2 (patch)
tree69b41257e797a7919ffa8ee77619805957d0abe8 /actions/imsettings.php
parent866dfa6822df54765a9b92336722d86cfad6b123 (diff)
parent63eddf216fac848aa2b7afbbafb0fcc4bf8b7d79 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions/imsettings.php')
-rw-r--r--actions/imsettings.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/actions/imsettings.php b/actions/imsettings.php
index f57933b43..751c6117c 100644
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -56,7 +56,7 @@ class ImsettingsAction extends ConnectSettingsAction
function title()
{
- return _('IM Settings');
+ return _('IM settings');
}
/**
@@ -121,7 +121,7 @@ class ImsettingsAction extends ConnectSettingsAction
} else {
$this->elementStart('ul', 'form_data');
$this->elementStart('li');
- $this->input('jabber', _('IM Address'),
+ $this->input('jabber', _('IM address'),
($this->arg('jabber')) ? $this->arg('jabber') : null,
sprintf(_('Jabber or GTalk address, '.
'like "UserName@example.org". '.