Merge remote branch 'gitorious/0.9.x' into 0.9.x

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

diff --git a/actions/imsettings.php b/actions/imsettings.php
index 6e138d3a6cb55bc2a477188b3ce3a740b8cc4664..6691c8dad76e95f53cbcf621810a3490ea813f95 100644 (file)
--- a/actions/imsettings.php
+++ b/actions/imsettings.php
@@ -127,7 +127,7 @@ class ImsettingsAction extends ConnectSettingsAction
                                          '(Did you add %s to your buddy list?)'),
                                        jabber_daemon_address()));
                 $this->hidden('jabber', $confirm->address);
-                // TRANS: Button label to cancel a IM address confirmation procedure.
+                // TRANS: Button label to cancel an IM address confirmation procedure.
                 $this->submit('cancel', _m('BUTTON','Cancel'));
             } else {
                 $this->elementStart('ul', 'form_data');
@@ -135,7 +135,7 @@ class ImsettingsAction extends ConnectSettingsAction
                 // TRANS: Field label for IM address input in IM settings form.
                 $this->input('jabber', _('IM address'),
                              ($this->arg('jabber')) ? $this->arg('jabber') : null,
-                             // TRANS: Form note in IM settings form.
+                             // TRANS: IM address input field instructions in IM settings form.
                              // TRANS: %s is the IM address set for the site.
                              sprintf(_('Jabber or GTalk address, '.
                                        'like "UserName@example.org". '.