From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Sun, 11 Apr 2010 21:47:04 +0000 (+0200)
Subject: Localisation updates for !StatusNet from !translatewiki.net !sntrans
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d7033c89066c756f630c4ff8eb840852c836d87b;p=quix0rs-gnu-social.git

Localisation updates for !StatusNet from !translatewiki.net !sntrans

Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
---

diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index 948ac9bf8e..5c4fdc370e 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:34:46+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:03+0000\n"
 "Language-Team: Afrikaans\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
 "X-Message-Group: out-statusnet\n"
@@ -71,8 +71,13 @@ msgstr "Gesluit"
 msgid "Save access settings"
 msgstr "Stoor toegangsinstellings"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Stoor"
@@ -103,7 +108,7 @@ msgstr "Hierdie bladsy bestaan nie"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
@@ -336,7 +341,7 @@ msgstr "Geen status met die ID gevind nie."
 msgid "This status is already a favorite."
 msgstr "Hierdie status is reeds 'n gunsteling."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Dit was nie moontlik om 'n gunsteling te skep nie."
 
@@ -458,7 +463,7 @@ msgstr "Groep nie gevind nie!"
 msgid "You are already a member of that group."
 msgstr "U is reeds 'n lid van die groep."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -509,17 +514,17 @@ msgid "Invalid token."
 msgstr "Ongeldige token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -550,12 +555,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Die vorm is onverwags ingestuur."
 
@@ -807,27 +815,44 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Nee"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Moenie hierdie gebruiker blokkeer nie"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Blokkeer hierdie gebruiker"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr ""
 
@@ -840,8 +865,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Die groep bestaan nie."
 
@@ -900,16 +925,24 @@ msgstr ""
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Kon nie gebruiker opdateer nie."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
@@ -961,11 +994,13 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Moenie die applikasie verwyder nie"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Skrap hierdie applikasie"
 
@@ -998,11 +1033,13 @@ msgstr "Verwyder kennisgewing"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Is u seker u wil hierdie kennisgewing verwyder?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Moenie hierdie kennisgewing verwyder nie"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Verwyder hierdie kennisgewing"
 
@@ -1024,7 +1061,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Verwyder die gebruiker"
 
@@ -1135,15 +1173,13 @@ msgid "Reset back to default"
 msgstr "Stel terug na standaard"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Stoor"
 
@@ -1269,178 +1305,238 @@ msgstr "Dit was nie moontlik om die aliasse te skep nie."
 msgid "Options saved."
 msgstr "Opsies is gestoor."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "E-posvoorkeure"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adres"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-posadres"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Huidige bevestigde e-posadres."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Verwyder"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-posadres"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-posadres, soos \"UserName@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Voeg by"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Inkomende e-pos"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuut"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Voorkeure"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr ""
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "Voorkeure is gestoor."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Geen e-posadres."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Nie 'n geldige e-posadres nie."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Dit is al reeds u e-posadres."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr ""
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Dit is die verkeerde IM-adres."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Bevestiging gekanselleer."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Dit is nie u e-posadres nie."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Die adres is verwyder."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Geen inkomende e-posadres."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Kon nie gebruikersdata opdateer nie."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Inkomende e-posadres is verwyder."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1623,15 +1719,17 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr ""
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Blok hierdie gebruiker van hierdie groep"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1799,90 +1897,149 @@ msgstr ""
 msgid "Error removing the block."
 msgstr ""
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "IM-instellings"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "IM is nie beskikbaar nie."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IP-adres"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IP-adres"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Voorkeure"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Voorkeure is gestoor."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Geen Jabber-ID nie."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Nie 'n geldige Jabber-ID nie"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Dit is al reeds u Jabber-ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Dit is die verkeerde IM-adres."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr ""
+"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Bevestiging gekanselleer."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Dit is nie u Jabber-ID nie."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Die adres is verwyder."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1923,7 +2080,9 @@ msgstr "Nooi nuwe gebruikers"
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2016,7 +2175,9 @@ msgstr "U moet aanteken alvorens u by groep kan aansluit."
 msgid "No nickname or ID."
 msgstr "Geen gebruikersnaam of ID nie."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s het by groep %2$s aangesluit"
@@ -2025,11 +2186,13 @@ msgstr "%1$s het by groep %2$s aangesluit"
 msgid "You must be logged in to leave a group."
 msgstr "U moet aanteken alvorens u 'n groep kan verlaat."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "U is nie 'n lid van daardie groep nie."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s het die groep %2$s verlaat"
@@ -2135,12 +2298,12 @@ msgstr ""
 msgid "New message"
 msgstr "Nuwe boodskap"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "U kan nie 'n boodskap aan hierdie gebruiker stuur nie."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Geen inhoud nie!"
 
@@ -2148,7 +2311,7 @@ msgstr "Geen inhoud nie!"
 msgid "No recipient specified."
 msgstr "Geen ontvanger gespesifiseer nie."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2396,7 +2559,7 @@ msgid "6 or more characters"
 msgstr "6 of meer karakters"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Bevestig"
 
@@ -3691,95 +3854,156 @@ msgstr ""
 msgid "Save site notice"
 msgstr ""
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "SMS-instellings"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr ""
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IP-adres"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr ""
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Bevestig"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "SMS-nommer"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Voorkeure"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Voorkeure is gestoor."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Geen telefoonnommer."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr ""
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Bevestiging gekanselleer."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr ""
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS-nommer"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr ""
 
@@ -4920,10 +5144,8 @@ msgstr "Lees-skryf"
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Kanselleer"
 
@@ -4999,34 +5221,40 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr ""
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr ""
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr ""
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr ""
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5034,195 +5262,201 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr ""
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr ""
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr ""
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr ""
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "U kan nie die gebruiker volg nie: die gebruiker bestaan nie."
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr ""
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
+msgstr "Kon nie die groep skep nie."
 
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Volle naam: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Ligging: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Tuisblad: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Oor: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
+"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
+"gestuur."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr ""
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr ""
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr ""
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr ""
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr ""
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr ""
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr ""
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr ""
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "U volg hierdie gebruiker:"
 msgstr[1] "U volg hierdie gebruikers:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr ""
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Hierdie gebruiker volg u:"
 msgstr[1] "Hierdie gebruikers volg u:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "U is nie 'n lid van enige groep nie."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "U is 'n lid van hierdie groep:"
 msgstr[1] "U is 'n lid van hierdie groepe:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6043,6 +6277,10 @@ msgstr ""
 msgid "Repeat this notice?"
 msgstr ""
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ja"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr ""
@@ -6229,47 +6467,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "'n paar sekondes gelede"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "ongeveer 'n minuut gelede"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "ongeveer %d minute gelede"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "ongeveer 'n uur gelede"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "ongeveer %d uur gelede"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "ongeveer een dag gelede"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "ongeveer %d dae gelede"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "ongeveer een maand gelede"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "ongeveer %d maande gelede"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "ongeveer een jaar gelede"
 
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index c23a8cb064..a300979b85 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:34:50+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:06+0000\n"
 "Language-Team: Arabic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: out-statusnet\n"
@@ -73,8 +73,13 @@ msgstr "ÙÙØºÙÙ"
 msgid "Save access settings"
 msgstr "ØÙØ¸ Ø¥Ø¹Ø¯Ø§Ø¯Øª Ø§ÙÙØµÙÙ"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Ø§ØÙØ¸"
@@ -105,7 +110,7 @@ msgstr "ÙØ§ ØµÙØØ© ÙÙØ°Ù"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ÙØ§ ÙØ³ØªØ®Ø¯Ù ÙÙØ°Ø§."
@@ -334,7 +339,7 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr "ÙØ°Ù Ø§ÙØØ§ÙØ© ÙÙØ¶ÙØ© Ø¨Ø§ÙÙØ¹Ù."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥ÙØ´Ø§Ø¡ ÙÙØ¶ÙØ©."
 
@@ -451,7 +456,7 @@ msgstr "ÙÙ ØªÙØ¬Ø¯ Ø§ÙÙØ¬ÙÙØ¹Ø©!"
 msgid "You are already a member of that group."
 msgstr ""
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -503,17 +508,17 @@ msgid "Invalid token."
 msgstr "ØØ¬Ù ØºÙØ± ØµØ§ÙØ."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -546,12 +551,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -803,27 +811,44 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "ÙØ§"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "ÙØ§ ØªÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "ÙØ¹Ù"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Ø§ÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "ÙØ´Ù ØÙØ¸ ÙØ¹ÙÙÙØ§Øª Ø§ÙÙÙØ¹."
 
@@ -836,8 +861,8 @@ msgstr "ÙØ´Ù ØÙØ¸ ÙØ¹ÙÙÙØ§Øª Ø§ÙÙÙØ¹."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "ÙØ§ ÙØ¬ÙÙØ¹Ø© ÙÙØ°Ù."
 
@@ -896,16 +921,24 @@ msgstr ""
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ØªØ¹Ø°ÙØ± ØªØØ¯ÙØ« Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ØªØ¹Ø°ÙØ± ØØ°Ù ØªØ£ÙÙØ¯ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
@@ -957,11 +990,13 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "ÙØ§ ØªØØ°Ù ÙØ°Ø§ Ø§ÙØªØ·Ø¨ÙÙ"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Ø§ØØ°Ù ÙØ°Ø§ Ø§ÙØªØ·Ø¨ÙÙ"
 
@@ -994,11 +1029,13 @@ msgstr "Ø§ØØ°Ù Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ø£ÙØªØ£ÙØ¯ ÙÙ Ø£ÙÙ ØªØ±ÙØ¯ ØØ°Ù ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±Ø"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "ÙØ§ ØªØØ°Ù ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Ø§ØØ°Ù ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
 
@@ -1020,7 +1057,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Ø§ØØ°Ù ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
@@ -1131,15 +1169,13 @@ msgid "Reset back to default"
 msgstr "Ø§Ø±Ø¬Ø¹ Ø¥ÙÙ Ø§ÙÙØ¨Ø¯Ø¦Ù"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Ø£Ø±Ø³Ù"
 
@@ -1265,178 +1301,238 @@ msgstr "ØªØ¹Ø°ÙØ± Ø¥ÙØ´Ø§Ø¡ Ø§ÙÙÙÙ."
 msgid "Options saved."
 msgstr "ØÙÙØ¸Øª Ø§ÙØ®ÙØ§Ø±Ø§Øª."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Ø£Ø¯Ø± ÙÙÙ ØªØ³ØªÙÙ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ ÙÙ %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Ø§ÙØ¹ÙÙØ§Ù"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ Ø§ÙÙÙØ¤ÙØ¯ Ø§ÙØØ§ÙÙ."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Ø£Ø²Ù"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Ø£ÙØºÙ"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ ÙØ«Ù \"UserName@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ø£Ø¶Ù"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ Ø§ÙÙØ§Ø±Ø¯"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Ø£Ø±Ø³Ù Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØªØ±ÙÙÙÙØ§ Ø¥ÙÙ ÙØ°Ø§ Ø§ÙØ¹ÙÙØ§Ù ÙØªØ±Ø³Ù Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¬Ø¯ÙØ¯Ø©."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Ø£ÙØ´Ø¦ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ ÙØªØ±Ø³Ù Ø¥ÙÙÙØ Ø£ÙØºÙ Ø§ÙÙØ¯ÙÙ."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Ø¬Ø¯ÙØ¯"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Ø§ÙØªÙØ¶ÙÙØ§Øª"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¨Ø§ÙØ§Ø´ØªØ±Ø§ÙØ§Øª Ø§ÙØ¬Ø¯ÙØ¯Ø© Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØ±ØªÙÙÙÙØ§ Ø¹ÙØ¯ÙØ§ ÙØ¶ÙÙ Ø£ØØ¯ÙÙ Ø¥Ø´Ø¹Ø§Ø±Ù ÙÙØ¶ÙØ©."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØªØ±ÙÙÙÙØ§ Ø¹ÙØ¯ÙØ§ ÙØ±Ø³Ù ÙÙ Ø£ØØ¯ Ø±Ø³Ø§ÙØ© Ø®Ø§ØµØ©."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØªØ±ÙÙÙÙØ§ Ø¹ÙØ¯ÙØ§ ÙØ±Ø³Ù ÙÙ Ø£ØØ¯ \"@-Ø±Ø¯\"."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Ø§Ø³ÙØ ÙØ£ØµØ¯ÙØ§Ø¦Ù Ø¨ØªÙØ¨ÙÙÙ ÙÙØ±Ø§Ø³ÙØªÙ Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Ø£Ø±ÙØ¯ Ø£Ù Ø£Ø±Ø³Ù Ø§ÙÙÙØ§ØØ¸Ø§Øª Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Ø§ÙØ´Ø± ÙÙÙØ© ÙØµØºÙØ±Ø© ÙØ¹ÙÙØ§Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "ØÙÙÙØ¸Øª Ø§ÙØªÙØ¶ÙÙØ§Øª."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "ØÙÙØ¸Øª ØªÙØ¶ÙÙØ§Øª Ø§ÙØªØµÙÙÙ."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "ÙØ§ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÙÙØ³ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ ØµØ§ÙØ."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "ÙØ°Ø§ ÙÙ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙØªØ±ÙÙÙ Ø³Ø§Ø¨ÙÙØ§."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "ÙØ°Ø§ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ ÙÙÙ ÙØ³ØªØ®Ø¯Ù Ø¢Ø®Ø± Ø¨Ø§ÙÙØ¹Ù."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥Ø¯Ø±Ø§Ø¬ Ø±ÙØ² Ø§ÙØªØ£ÙÙØ¯."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "ÙØ°Ø§ Ø¹ÙÙØ§Ù ÙØØ§Ø¯Ø«Ø© ÙÙØ±ÙØ© Ø®Ø§Ø·Ø¦."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Ø£ÙÙØºÙ Ø§ÙØªØ£ÙÙØ¯."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "ÙØ°Ø§ ÙÙØ³ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Ø£Ø²ÙÙ ÙØ°Ø§ Ø§ÙØ¹ÙÙØ§Ù."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÙØ§ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ ÙØ§Ø±Ø¯."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ØªØ¹Ø°ÙØ± ØªØØ¯ÙØ« Ø³Ø¬Ù Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1622,15 +1718,17 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "ÙØ§ ØªÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ ÙØ°Ù Ø§ÙÙØ¬ÙÙØ¹Ø©"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Ø§ÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ ÙØ°Ù Ø§ÙÙØ¬ÙÙØ¹Ø©"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "Ø®Ø·Ø£ ÙÙ ÙØ§Ø¹Ø¯Ø© Ø§ÙØ¨ÙØ§ÙØ§Øª Ø£Ø«ÙØ§Ø¡ ÙÙØ¹ Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø©."
 
@@ -1804,90 +1902,148 @@ msgstr "Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙØ³ ÙÙÙÙØ¹ÙØ§ ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø©."
 msgid "Error removing the block."
 msgstr "Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ ÙÙØ¹ Ø§ÙØØ¬Ø¨."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙÙØ±Ø§Ø³ÙØ© Ø§ÙÙÙØ±ÙØ©"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "Ø§ÙÙØ±Ø§Ø³ÙØ© Ø§ÙÙÙØ±ÙØ© ØºÙØ± ÙØªÙÙØ±Ø©."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Ø¹ÙÙØ§Ù Ø§ÙÙØ±Ø§Ø³ÙØ© Ø§ÙÙÙØ±ÙØ©"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Ø¹ÙÙØ§Ù Ø§ÙÙØ±Ø§Ø³ÙØ© Ø§ÙÙÙØ±ÙØ©"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Ø§ÙØªÙØ¶ÙÙØ§Øª"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "ØÙÙÙØ¸Øª Ø§ÙØªÙØ¶ÙÙØ§Øª."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "ÙØ§ ÙÙÙØ© Ø¬Ø§Ø¨Ø±."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "ÙÙØ³Øª ÙÙÙØ© Ø¬Ø§Ø¨Ø± ØµØ§ÙØØ©"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "ÙØ°Ø§ Ø¹ÙÙØ§Ù ÙØØ§Ø¯Ø«Ø© ÙÙØ±ÙØ© Ø®Ø§Ø·Ø¦."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ØªØ¹Ø°ÙØ± ØØ°Ù ØªØ£ÙÙØ¯ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Ø£ÙÙØºÙ Ø§ÙØªØ£ÙÙØ¯."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "ÙØ°Ù ÙÙØ³Øª ÙÙÙØªÙ ÙÙ Ø¬Ø§Ø¨Ø±."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Ø£Ø²ÙÙ ÙØ°Ø§ Ø§ÙØ¹ÙÙØ§Ù."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1928,7 +2084,9 @@ msgstr "Ø¯Ø¹ÙØ© ÙØ³ØªØ®Ø¯ÙÙÙ Ø¬Ø¯Ø¯"
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2022,7 +2180,9 @@ msgstr "ÙØ¬Ø¨ Ø£Ù ØªÙØ¬ ÙØªÙØ¶Ù Ø¥ÙÙ ÙØ¬ÙÙØ¹Ø©."
 msgid "No nickname or ID."
 msgstr "ÙØ§ Ø§Ø³Ù ÙØ³ØªØ¹Ø§Ø±."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s Ø§ÙØ¶Ù ÙÙÙØ¬ÙÙØ¹Ø© %2$s"
@@ -2031,11 +2191,13 @@ msgstr "%1$s Ø§ÙØ¶Ù ÙÙÙØ¬ÙÙØ¹Ø© %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "ÙØ¬Ø¨ Ø£Ù ØªÙØ¬ ÙØªØºØ§Ø¯Ø± ÙØ¬ÙÙØ¹Ø©."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "ÙØ³Øª Ø¹Ø¶ÙØ§ ÙÙ ØªÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø©."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s ØªØ±Ù Ø§ÙÙØ¬ÙÙØ¹Ø© %2$s"
@@ -2142,12 +2304,12 @@ msgstr "Ø§Ø³ØªØ®Ø¯Ù ÙØ°Ø§ Ø§ÙÙÙÙØ°Ø¬ ÙØ¥ÙØ´Ø§Ø¡ ÙØ¬ÙÙØ¹Ø© Ø¬Ø¯ÙØ¯Ø©.
 msgid "New message"
 msgstr "Ø±Ø³Ø§ÙØ© Ø¬Ø¯ÙØ¯Ø©"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "ÙØ§ ÙÙÙÙÙ Ø¥Ø±Ø³Ø§Ù Ø±Ø³Ø§Ø¦Ù Ø¥ÙÙ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "ÙØ§ ÙØØªÙÙ!"
 
@@ -2155,7 +2317,7 @@ msgstr "ÙØ§ ÙØØªÙÙ!"
 msgid "No recipient specified."
 msgstr "ÙØ§ ÙØ³ØªÙÙ ØÙØ¯ÙØ¯."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2405,7 +2567,7 @@ msgid "6 or more characters"
 msgstr "6 Ø£ØØ±Ù Ø£Ù Ø£ÙØ«Ø±"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Ø£ÙÙØ¯"
 
@@ -3734,95 +3896,156 @@ msgstr "ÙØµ Ø¥Ø´Ø¹Ø§Ø± Ø¹Ø§Ù ÙÙÙÙÙØ¹ (255 ØØ±Ù ÙØØ¯ Ø£ÙØµÙØ ÙØ³Ù
 msgid "Save site notice"
 msgstr "Ø§ØÙØ¸ Ø¥Ø´Ø¹Ø§Ø± Ø§ÙÙÙÙØ¹"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "Ø¥Ø¹Ø¯Ø§Ø¯Ø§Øª Ø§ÙØ±Ø³Ø§Ø¦Ù Ø§ÙÙØµÙØ±Ø©"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "ÙØ§ ÙÙÙÙÙ Ø§Ø³ØªÙØ§Ù Ø±Ø³Ø§Ø¦Ù ÙØµÙØ±Ø© Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØ±ØªÙÙÙ ÙÙ %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "Ø§ÙØ±Ø³Ø§Ø¦Ù Ø§ÙÙØµÙØ±Ø© ØºÙØ± ÙØªÙÙØ±Ø©."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Ø¹ÙÙØ§Ù Ø§ÙÙØ±Ø§Ø³ÙØ© Ø§ÙÙÙØ±ÙØ©"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Ø±ÙØ² Ø§ÙØªØ£ÙÙØ¯"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Ø£ÙÙØ¯"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "Ø±ÙÙ ÙØ§ØªÙ SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Ø§ÙØªÙØ¶ÙÙØ§Øª"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "ØÙÙÙØ¸Øª Ø§ÙØªÙØ¶ÙÙØ§Øª."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "ÙØ§ Ø±ÙÙ ÙØ§ØªÙ."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr ""
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Ø¥Ù Ø±ÙÙ Ø§ÙØªØ£ÙÙØ¯ ÙØ°Ø§ Ø®Ø§Ø·Ø¦."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Ø£ÙÙØºÙ Ø§ÙØªØ£ÙÙØ¯."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "ÙØ°Ø§ ÙÙØ³ Ø±ÙÙ ÙØ§ØªÙÙ."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Ø±ÙÙ ÙØ§ØªÙ SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "ÙÙ ØªØ¯Ø®Ù Ø±ÙØ²ÙØ§"
 
@@ -4978,10 +5201,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Ø£ÙØºÙ"
 
@@ -5055,34 +5276,40 @@ msgstr "ÙØ´Ù Ø§ÙØ£ÙØ±"
 msgid "Notice with that id does not exist"
 msgstr "Ø§ÙÙÙØ§ØØ¸Ø© Ø¨ÙØ°Ø§ Ø§ÙØ±ÙÙ ØºÙØ± ÙÙØ¬ÙØ¯Ø©"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "ÙÙØ³ ÙÙÙØ³ØªØ®Ø¯Ù Ø¥Ø´Ø¹Ø§Ø± Ø£Ø®ÙØ±"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ÙÙ ÙÙÙÙ Ø¥ÙØ¬Ø§Ø¯ ÙØ³ØªØ®Ø¯Ù Ø¨Ø§ÙØ§Ø³Ù %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "ÙÙ ÙÙÙÙ Ø¥ÙØ¬Ø§Ø¯ ÙØ³ØªØ®Ø¯Ù Ø¨Ø§ÙØ§Ø³Ù %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Ø§ÙØªÙØ¨ÙÙ ØªÙ Ø¥Ø±Ø³Ø§ÙÙ Ø¥ÙÙ %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5093,169 +5320,173 @@ msgstr ""
 "Ø§ÙÙØ´ØªØ±ÙÙÙ: %2$s\n"
 "Ø§ÙØ¥Ø´Ø¹Ø§Ø±Ø§Øª: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Ø£ÙØª Ø¨Ø§ÙÙØ¹Ù Ø¹Ø¶Ù ÙÙ ÙØ°Ù Ø§ÙÙØ¬ÙÙØ¹Ø©"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "ÙÙ ÙÙÙÙ Ø¶Ù Ø§ÙÙØ³ØªØ®Ø¯Ù %s Ø¥ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø© %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s Ø§ÙØ¶Ù Ø¥ÙÙ ÙØ¬ÙÙØ¹Ø© %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "ÙÙ ÙÙÙÙ Ø¶Ù Ø§ÙÙØ³ØªØ®Ø¯Ù %1$s Ø¥ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø© %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "ÙÙ ÙÙÙÙ Ø¥Ø²Ø§ÙØ© Ø§ÙÙØ³ØªØ®Ø¯Ù %s ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ø© %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s ØªØ±Ù Ø§ÙÙØ¬ÙÙØ¹Ø© %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Ø§ÙØ§Ø³Ù Ø§ÙÙØ§ÙÙ: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Ø§ÙÙÙÙØ¹: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Ø§ÙØµÙØØ© Ø§ÙØ±Ø¦ÙØ³ÙØ©: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Ø¹Ù: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Ø±Ø³Ø§ÙØ© ÙØ¨Ø§Ø´Ø±Ø© Ø¥ÙÙ %s ØªÙ Ø¥Ø±Ø³Ø§ÙÙØ§"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "ÙØ§ ÙÙÙÙÙ ØªÙØ±Ø§Ø± ÙÙØ§ØØ¸ØªÙ Ø§ÙØ®Ø§ØµØ©"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "ÙØ±Ø± Ø¨Ø§ÙÙØ¹Ù ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Ø§ÙØ¥Ø´Ø¹Ø§Ø± ÙÙ %s ÙÙØ±Ø±"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Ø®Ø·Ø£ ØªÙØ±Ø§Ø± Ø§ÙØ¥Ø´Ø¹Ø§Ø±."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Ø±ÙØ¯ Ø¹ÙÙ Ø±Ø³Ø§ÙØ© %s"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ ØÙØ¸ Ø§ÙØ¥Ø´Ø¹Ø§Ø±."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "ÙÙØ´ØªØ±Ù Ø¨%s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Ø§ÙØ£ÙØ± ÙÙ ÙÙØ¬ÙØ²Ù Ø¨Ø¹Ø¯."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Ø§ÙØ¥Ø´Ø¹Ø§Ø± ÙÙØ·ÙØ£."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥Ø·ÙØ§Ø¡ Ø§ÙØ¥Ø´Ø¹Ø§Ø±Ø§Øª."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Ø§ÙØ¥Ø´Ø¹Ø§Ø± ÙØ¹ÙÙ."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "ØªØ¹Ø°ÙØ± ØªØ´ØºÙÙ Ø§ÙØ¥Ø´Ø¹Ø§Ø±."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "Ø£ÙØºÙ Ø§ÙØ§Ø´ØªØ±Ø§Ù"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "ÙØ³Øª ÙÙØ´ØªØ±ÙÙØ§ Ø¨Ø£Ù Ø£ØØ¯."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ÙØ³Øª ÙØ´ØªØ±ÙÙØ§ Ø¨Ø£ØØ¯."
@@ -5265,11 +5496,11 @@ msgstr[3] "Ø£ÙØª ÙØ´ØªØ±Ù Ø¨ÙØ¤ÙØ§Ø¡ Ø§ÙØ£Ø´Ø®Ø§Øµ:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "ÙØ§ Ø£ØØ¯ ÙØ´ØªØ±Ù Ø¨Ù."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "ÙØ§ Ø£ØØ¯ ÙØ´ØªØ±Ù Ø¨Ù."
@@ -5279,11 +5510,11 @@ msgstr[3] "ÙØ¤ÙØ§Ø¡ Ø§ÙØ£Ø´Ø®Ø§Øµ ÙØ´ØªØ±ÙÙÙ Ø¨Ù:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "ÙØ³Øª Ø¹Ø¶ÙÙØ§ ÙÙ Ø£Ù ÙØ¬ÙÙØ¹Ø©."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ÙØ³Øª Ø¹Ø¶ÙÙØ§ ÙÙ Ø£Ù ÙØ¬ÙÙØ¹Ø©."
@@ -5293,7 +5524,7 @@ msgstr[3] "Ø£ÙØª Ø¹Ø¶Ù ÙÙ ÙØ°Ù Ø§ÙÙØ¬ÙÙØ¹Ø§Øª:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6174,6 +6405,10 @@ msgstr "ÙØ§ ÙØ¯Ø®ÙØ§Øª Ø±Ø¬ÙØ¹ Ø¥ÙÙ."
 msgid "Repeat this notice?"
 msgstr "Ø£Ø£ÙØ±ÙØ± ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±ØÙ"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "ÙØ¹Ù"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "ÙØ±ÙØ± ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
@@ -6361,47 +6596,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "ÙØ±Ø§ÙØ¨"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "ÙØ¨Ù ÙØØ¸Ø§Øª ÙÙÙÙØ©"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "ÙØ¨Ù Ø¯ÙÙÙØ© ØªÙØ±ÙØ¨ÙØ§"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "ÙØ¨Ù Ø³Ø§Ø¹Ø© ØªÙØ±ÙØ¨ÙØ§"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "ÙØ¨Ù ÙÙÙ ØªÙØ±ÙØ¨Ø§"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "ÙØ¨Ù Ø´ÙØ± ØªÙØ±ÙØ¨ÙØ§"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "ÙØ¨Ù Ø³ÙØ© ØªÙØ±ÙØ¨ÙØ§"
 
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 878efe2c6b..765a3a6dbe 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:34:53+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:09+0000\n"
 "Language-Team: Egyptian Spoken Arabic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: out-statusnet\n"
@@ -78,8 +78,13 @@ msgstr "ÙÙØºÙÙ"
 msgid "Save access settings"
 msgstr "Ø§Ø°Ù Ø¥Ø¹Ø¯Ø§Ø¯Øª Ø§ÙÙÙÙØ¹"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -111,7 +116,7 @@ msgstr "ÙØ§ ØµÙØÙ ÙÙØ°Ù"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ÙØ§ ÙØ³ØªØ®Ø¯Ù ÙÙØ°Ø§."
@@ -340,7 +345,7 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr "Ø§ÙØØ§ÙÙ Ø¯Ù ÙÙØ¬ÙØ¯Ù ÙØ¹ÙØ§ ÙÙ Ø§ÙØªÙØ¶ÙÙØ§Øª."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥ÙØ´Ø§Ø¡ ÙÙØ¶ÙÙ."
 
@@ -457,7 +462,7 @@ msgstr "ÙÙ ØªÙØ¬Ø¯ Ø§ÙÙØ¬ÙÙØ¹Ø©!"
 msgid "You are already a member of that group."
 msgstr ""
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -509,17 +514,17 @@ msgid "Invalid token."
 msgstr "ØØ¬Ù ØºÙØ± ØµØ§ÙØ."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -552,12 +557,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -810,27 +818,44 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "ÙØ§"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "ÙØ§ ØªÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "ÙØ¹Ù"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Ø§ÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "ÙØ´Ù ØÙØ¸ ÙØ¹ÙÙÙØ§Øª Ø§ÙÙÙØ¹."
 
@@ -843,8 +868,8 @@ msgstr "ÙØ´Ù ØÙØ¸ ÙØ¹ÙÙÙØ§Øª Ø§ÙÙÙØ¹."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "ÙØ§ ÙØ¬ÙÙØ¹Ù ÙÙØ°Ù."
 
@@ -903,16 +928,24 @@ msgstr ""
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ØªØ¹Ø°ÙØ± ØªØØ¯ÙØ« Ø§ÙÙØ³ØªØ®Ø¯Ù."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ØªØ¹Ø°ÙØ± ØØ°Ù ØªØ£ÙÙØ¯ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
@@ -967,12 +1000,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "ÙØ§ ØªØØ°Ù ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "Ø§ØØ°Ù ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
@@ -1006,11 +1041,13 @@ msgstr "Ø§ØØ°Ù Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ø£ÙØªØ£ÙØ¯ ÙÙ Ø£ÙÙ ØªØ±ÙØ¯ ØØ°Ù ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±Ø"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "ÙØ§ ØªØØ°Ù ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Ø§ØØ°Ù ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
 
@@ -1032,7 +1069,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Ø§ØØ°Ù ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù"
 
@@ -1143,15 +1181,13 @@ msgid "Reset back to default"
 msgstr "Ø§Ø±Ø¬Ø¹ Ø¥ÙÙ Ø§ÙÙØ¨Ø¯Ø¦Ù"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Ø£Ø±Ø³Ù"
 
@@ -1278,178 +1314,238 @@ msgstr "ØªØ¹Ø°ÙØ± Ø¥ÙØ´Ø§Ø¡ Ø§ÙÙÙÙ."
 msgid "Options saved."
 msgstr "ØÙÙØ¸Øª Ø§ÙØ®ÙØ§Ø±Ø§Øª."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ØªØ¸Ø¨ÙØ·Ø§Øª Ø§ÙØ§ÙÙÙÙ"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Ø£Ø¯Ø± ÙÙÙ ØªØ³ØªÙÙ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ ÙÙ %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Ø§ÙØ¹ÙÙØ§Ù"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ§ÙÙÙÙ"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ Ø§ÙÙÙØ¤ÙØ¯ Ø§ÙØØ§ÙÙ."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Ø£Ø²Ù"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Ø£ÙØºÙ"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ§ÙÙÙÙ"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙØ ÙØ«Ù \"UserName@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ø£Ø¶Ù"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ Ø§ÙÙØ§Ø±Ø¯"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Ø£Ø±Ø³Ù Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØªØ±ÙÙÙÙØ§ Ø¥ÙÙ ÙØ°Ø§ Ø§ÙØ¹ÙÙØ§Ù ÙØªØ±Ø³Ù Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¬Ø¯ÙØ¯Ù."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Ø£ÙØ´Ø¦ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ ÙØªØ±Ø³Ù Ø¥ÙÙÙØ Ø£ÙØºÙ Ø§ÙÙØ¯ÙÙ."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Ø¬Ø¯ÙØ¯"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Ø§ÙØªÙØ¶ÙÙØ§Øª"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¥Ø´Ø¹Ø§Ø±Ø§Øª Ø¨Ø§ÙØ§Ø´ØªØ±Ø§ÙØ§Øª Ø§ÙØ¬Ø¯ÙØ¯Ù Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØ±ØªÙÙÙÙØ§ Ø¹ÙØ¯ÙØ§ ÙØ¶ÙÙ Ø£ØØ¯ÙÙ Ø¥Ø´Ø¹Ø§Ø±Ù ÙÙØ¶ÙÙ."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Ø£Ø±Ø³Ù ÙÙ Ø¨Ø±ÙØ¯ÙØ§ Ø¥ÙÙØªØ±ÙÙÙÙØ§ Ø¹ÙØ¯ÙØ§ ÙØ±Ø³Ù ÙÙ Ø£ØØ¯ÙÙ \"@-Ø±Ø¯\"."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Ø£Ø±ÙØ¯ Ø£Ù Ø£Ø±Ø³Ù Ø§ÙÙÙØ§ØØ¸Ø§Øª Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "ØÙÙÙØ¸Øª Ø§ÙØªÙØ¶ÙÙØ§Øª."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "ÙØ§ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ Ø¥ÙÙØªØ±ÙÙÙ."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÙÙØ³ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯ ØµØ§ÙØ."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "ÙØ°Ø§ ÙÙ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙØªØ±ÙÙÙ Ø³Ø§Ø¨ÙÙØ§."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "ÙØ°Ø§ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ ÙÙÙ ÙØ³ØªØ®Ø¯Ù Ø¢Ø®Ø± Ø¨Ø§ÙÙØ¹Ù."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ØªØ¹Ø°ÙØ± Ø¥Ø¯Ø±Ø§Ø¬ Ø±ÙØ² Ø§ÙØªØ£ÙÙØ¯."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "ÙØ°Ø§ Ø¹ÙÙØ§Ù ÙØØ§Ø¯Ø«Ù ÙÙØ±ÙÙ Ø®Ø§Ø·Ø¦."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Ø£ÙÙØºÙ Ø§ÙØªØ£ÙÙØ¯."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "ÙØ°Ø§ ÙÙØ³ Ø¹ÙÙØ§Ù Ø¨Ø±ÙØ¯Ù Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Ø£Ø²ÙÙ ÙØ°Ø§ Ø§ÙØ¹ÙÙØ§Ù."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr ""
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr ""
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1635,15 +1731,17 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "ÙØ§ ØªÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ ÙØ°Ù Ø§ÙÙØ¬ÙÙØ¹Ø©"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Ø§ÙÙØ¹ ÙØ°Ø§ Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ ÙØ°Ù Ø§ÙÙØ¬ÙÙØ¹Ø©"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "Ø®Ø·Ø£ ÙÙ ÙØ§Ø¹Ø¯Ù Ø§ÙØ¨ÙØ§ÙØ§Øª Ø£Ø«ÙØ§Ø¡ ÙÙØ¹ Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ù."
 
@@ -1811,90 +1909,148 @@ msgstr "Ø§ÙÙØ³ØªØ®Ø¯Ù ÙÙØ³ ÙÙÙÙØ¹ÙØ§ ÙÙ Ø§ÙÙØ¬ÙÙØ¹Ù."
 msgid "Error removing the block."
 msgstr "Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ ÙÙØ¹ Ø§ÙØØ¬Ø¨."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "ØªØ¸Ø¨ÙØ·Ø§Øª Ø¨Ø¹Øª Ø§ÙØ±Ø³Ø§ÙÙ Ø§ÙÙÙØ±ÙÙ"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "Ø§ÙÙØ±Ø§Ø³ÙÙ Ø§ÙÙÙØ±ÙÙ ØºÙØ± ÙØªÙÙØ±Ù."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ±Ø³Ø§ÙÙ Ø§ÙÙÙØ±ÙÙ"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ±Ø³Ø§ÙÙ Ø§ÙÙÙØ±ÙÙ"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Ø§ÙØªÙØ¶ÙÙØ§Øª"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "ØÙÙÙØ¸Øª Ø§ÙØªÙØ¶ÙÙØ§Øª."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "ÙØ§ ÙÙÙÙ Ø¬Ø§Ø¨Ø±."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "ÙÙØ³Øª ÙÙÙÙ Ø¬Ø§Ø¨Ø± ØµØ§ÙØØ©"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "ÙØ°Ø§ Ø¹ÙÙØ§Ù ÙØØ§Ø¯Ø«Ù ÙÙØ±ÙÙ Ø®Ø§Ø·Ø¦."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ØªØ¹Ø°ÙØ± ØØ°Ù ØªØ£ÙÙØ¯ Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØªØ±ÙÙÙ."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Ø£ÙÙØºÙ Ø§ÙØªØ£ÙÙØ¯."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "ÙØ°Ù ÙÙØ³Øª ÙÙÙØªÙ ÙÙ Ø¬Ø§Ø¨Ø±."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Ø£Ø²ÙÙ ÙØ°Ø§ Ø§ÙØ¹ÙÙØ§Ù."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1935,7 +2091,9 @@ msgstr "Ø¯Ø¹ÙÙ ÙØ³ØªØ®Ø¯ÙÙÙ Ø¬Ø¯Ø¯"
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2030,7 +2188,9 @@ msgstr ""
 msgid "No nickname or ID."
 msgstr "ÙØ§ Ø§Ø³Ù ÙØ³ØªØ¹Ø§Ø±."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s Ø¯Ø®Ù Ø¬Ø±ÙÙ¾ %2$s"
@@ -2039,11 +2199,13 @@ msgstr "%1$s Ø¯Ø®Ù Ø¬Ø±ÙÙ¾ %2$s"
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "ÙØ³Øª Ø¹Ø¶ÙØ§ ÙÙ ØªÙÙ Ø§ÙÙØ¬ÙÙØ¹Ù."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s Ø³Ø§Ø¨ Ø¬Ø±ÙÙ¾ %2$s"
@@ -2150,12 +2312,12 @@ msgstr "Ø§Ø³ØªØ®Ø¯Ù ÙØ°Ø§ Ø§ÙÙÙÙØ°Ø¬ ÙØ¥ÙØ´Ø§Ø¡ ÙØ¬ÙÙØ¹Ù Ø¬Ø¯ÙØ¯Ù.
 msgid "New message"
 msgstr "Ø±Ø³Ø§ÙÙ Ø¬Ø¯ÙØ¯Ø©"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr ""
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "ÙØ§ ÙØØªÙÙ!"
 
@@ -2163,7 +2325,7 @@ msgstr "ÙØ§ ÙØØªÙÙ!"
 msgid "No recipient specified."
 msgstr "ÙØ§ ÙØ³ØªÙÙ ØÙØ¯ÙØ¯."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2411,7 +2573,7 @@ msgid "6 or more characters"
 msgstr ""
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Ø£ÙÙØ¯"
 
@@ -3728,95 +3890,156 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Ø¥Ø´Ø¹Ø§Ø± Ø§ÙÙÙÙØ¹"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "ØªØ¸Ø¨ÙØ·Ø§Øª Ø§ÙÙSMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "ÙØ§ ÙÙÙÙÙ Ø§Ø³ØªÙØ§Ù Ø±Ø³Ø§Ø¦Ù ÙØµÙØ±Ù Ø¹Ø¨Ø± Ø§ÙØ¨Ø±ÙØ¯ Ø§ÙØ¥ÙÙØ±ØªÙÙÙ ÙÙ %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "Ø§ÙØ±Ø³Ø§Ø¦Ù Ø§ÙÙØµÙØ±Ù ØºÙØ± ÙØªÙÙØ±Ù."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Ø¹ÙÙØ§Ù Ø§ÙØ±Ø³Ø§ÙÙ Ø§ÙÙÙØ±ÙÙ"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Ø±ÙØ² Ø§ÙØªØ£ÙÙØ¯"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Ø£ÙÙØ¯"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "ÙÙØ±Ø© ØªÙÙÙÙÙ Ø§ÙÙSMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Ø§ÙØªÙØ¶ÙÙØ§Øª"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "ØÙÙÙØ¸Øª Ø§ÙØªÙØ¶ÙÙØ§Øª."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "ÙØ§ Ø±ÙÙ ÙØ§ØªÙ."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr ""
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Ø£ÙÙØºÙ Ø§ÙØªØ£ÙÙØ¯."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "ÙØ°Ø§ ÙÙØ³ Ø±ÙÙ ÙØ§ØªÙÙ."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "ÙÙØ±Ø© ØªÙÙÙÙÙ Ø§ÙÙSMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr ""
 
@@ -4995,10 +5218,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Ø£ÙØºÙ"
 
@@ -5072,34 +5293,40 @@ msgstr "ÙØ´Ù Ø§ÙØ£ÙØ±"
 msgid "Notice with that id does not exist"
 msgstr "Ø§ÙÙÙØ§ØØ¸Ù Ø¨Ø§ÙÙID Ø¯Ù ÙØ§ÙÙØ§Ø´ ÙØ¬ÙØ¯"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "ÙÙØ³ ÙÙÙØ³ØªØ®Ø¯Ù Ø¥Ø´Ø¹Ø§Ø± Ø£Ø®ÙØ±"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ÙØ§ ÙÙØ¹Ø´ ÙÙØ§ÙÙ ÙÙØ²Ø± Ø¨Ø¥Ø³Ù %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "ÙØ§ ÙÙØ¹Ø´ ÙÙØ§ÙÙ ÙÙØ²Ø± Ø¨Ø¥Ø³Ù %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Nudge Ø§ØªØ¨Ø¹ØªØª ÙÙ %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5110,169 +5337,173 @@ msgstr ""
 "Ø§ÙÙØ´ØªØ±ÙÙÙ: %2$s\n"
 "Ø§ÙØ¥Ø´Ø¹Ø§Ø±Ø§Øª: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Ø§ÙØª Ø§ØµÙØ§ Ø¹Ø¶Ù ÙÙ Ø§ÙØ¬Ø±ÙÙ¾ Ø¯Ù"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "ÙØ§ ÙÙØ¹Ø´ ÙØ¯Ø®Ù Ø§ÙÙÙØ²Ø± %s ÙØ¬Ø±ÙÙ¾ %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s Ø§ÙØ¶Ù Ø¥ÙÙ ÙØ¬ÙÙØ¹Ù %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "ÙØ§ ÙÙØ¹Ø´ ÙØ¶Ù %1$s ÙÙØ¬Ø±ÙÙ¾ %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "ÙØ§ ÙÙØ¹Ø´ ÙØ´ÙÙ Ø§ÙÙÙØ²Ø± %s ÙØ¬Ø±ÙÙ¾ %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s Ø³Ø§Ø¨ Ø§ÙØ¬Ø±ÙÙ¾ %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Ø§ÙØ§Ø³Ù Ø§ÙÙØ§ÙÙ: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Ø§ÙÙÙÙØ¹: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Ø§ÙØµÙØÙ Ø§ÙØ±Ø¦ÙØ³ÙØ©: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Ø¹Ù: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Ø±Ø³Ø§ÙÙ ÙØ¨Ø§Ø´Ø±Ù Ø§ØªØ¨Ø¹ØªØª ÙÙ %s"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "Ø§ÙÙÙØ§ØØ¸Ù Ø¨ØªØ§Ø¹ØªÙ ÙØ´ ÙØ§ÙØ¹Ù ØªØªÙØ±Ø±"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "ÙØ±Ø± Ø¨Ø§ÙÙØ¹Ù ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Ø§ÙØ¥Ø´Ø¹Ø§Ø± ÙÙ %s ÙÙØ±Ø±"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Ø®Ø·Ø£ ØªÙØ±Ø§Ø± Ø§ÙØ¥Ø´Ø¹Ø§Ø±."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Ø±ÙØ¯ Ø¹ÙÙ Ø±Ø³Ø§ÙÙ %s"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Ø®Ø·Ø£ Ø£Ø«ÙØ§Ø¡ ØÙØ¸ Ø§ÙØ¥Ø´Ø¹Ø§Ø±."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "ÙÙØ´ØªØ±Ù Ø¨%s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "Ø£ÙØºÙ Ø§ÙØ§Ø´ØªØ±Ø§Ù"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "ÙØ³Øª ÙÙØ´ØªØ±ÙÙØ§ Ø¨Ø£Ù Ø£ØØ¯."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ÙØ³Øª ÙØ´ØªØ±ÙÙØ§ Ø¨Ø£ØØ¯."
@@ -5282,11 +5513,11 @@ msgstr[3] "Ø£ÙØª ÙØ´ØªØ±Ù Ø¨ÙØ¤ÙØ§Ø¡ Ø§ÙØ£Ø´Ø®Ø§Øµ:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "ÙØ§ Ø£ØØ¯ ÙØ´ØªØ±Ù Ø¨Ù."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "ÙØ§ Ø£ØØ¯ ÙØ´ØªØ±Ù Ø¨Ù."
@@ -5296,11 +5527,11 @@ msgstr[3] "ÙØ¤ÙØ§Ø¡ Ø§ÙØ£Ø´Ø®Ø§Øµ ÙØ´ØªØ±ÙÙÙ Ø¨Ù:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "ÙØ³Øª Ø¹Ø¶ÙÙØ§ ÙÙ Ø£Ù ÙØ¬ÙÙØ¹Ù."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ÙØ³Øª Ø¹Ø¶ÙÙØ§ ÙÙ Ø£Ù ÙØ¬ÙÙØ¹Ù."
@@ -5310,7 +5541,7 @@ msgstr[3] "Ø£ÙØª Ø¹Ø¶Ù ÙÙ ÙØ°Ù Ø§ÙÙØ¬ÙÙØ¹Ø§Øª:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6132,6 +6363,10 @@ msgstr "ÙØ§ ÙØ¯Ø®ÙØ§Øª Ø±Ø¬ÙØ¹ Ø¥ÙÙ."
 msgid "Repeat this notice?"
 msgstr "ÙØ±Ø± ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±Ø"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "ÙØ¹Ù"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "ÙØ±Ø± ÙØ°Ø§ Ø§ÙØ¥Ø´Ø¹Ø§Ø±"
@@ -6320,47 +6555,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "ÙØ¨Ù ÙØØ¸Ø§Øª ÙÙÙÙØ©"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "ÙØ¨Ù Ø¯ÙÙÙÙ ØªÙØ±ÙØ¨ÙØ§"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "ÙØ¨Ù Ø³Ø§Ø¹Ù ØªÙØ±ÙØ¨ÙØ§"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "ÙØ¨Ù ÙÙÙ ØªÙØ±ÙØ¨Ø§"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "ÙØ¨Ù Ø´ÙØ± ØªÙØ±ÙØ¨ÙØ§"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "ÙØ¨Ù Ø³ÙÙ ØªÙØ±ÙØ¨ÙØ§"
 
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index c2c8b92dff..a23a8a62a2 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:34:56+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:12+0000\n"
 "Language-Team: Bulgarian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: out-statusnet\n"
@@ -73,8 +73,13 @@ msgstr "ÐÐ°ÑÐ²Ð¾ÑÐµÐ½"
 msgid "Save access settings"
 msgstr "ÐÐ°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ Ð·Ð° Ð´Ð¾ÑÑÑÐ¿"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ÐÐ°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ"
@@ -105,7 +110,7 @@ msgstr "ÐÑÐ¼Ð° ÑÐ°ÐºÐ°ÐºÐ° ÑÑÑÐ°Ð½Ð¸ÑÐ°."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ÐÑÐ¼Ð° ÑÐ°ÐºÑÐ² Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»"
@@ -338,7 +343,7 @@ msgstr "ÐÐµ Ðµ Ð¾ÑÐºÑÐ¸ÑÐ° Ð±ÐµÐ»ÐµÐ¶ÐºÐ° Ñ ÑÐ°ÐºÑÐ² Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°
 msgid "This status is already a favorite."
 msgstr "Ð¢Ð°Ð·Ð¸ Ð±ÐµÐ»ÐµÐ¶ÐºÐ° Ð²ÐµÑÐµ Ðµ Ð¾ÑÐ±ÐµÐ»ÑÐ·Ð°Ð½Ð° ÐºÐ°ÑÐ¾ Ð»ÑÐ±Ð¸Ð¼Ð°."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÐ±ÐµÐ»ÑÐ·Ð²Ð°Ð½Ðµ ÐºÐ°ÑÐ¾ Ð»ÑÐ±Ð¸Ð¼Ð°."
 
@@ -458,7 +463,7 @@ msgstr "ÐÑÑÐ¿Ð°ÑÐ° Ð½Ðµ Ðµ Ð¾ÑÐºÑÐ¸ÑÐ°."
 msgid "You are already a member of that group."
 msgstr "ÐÐµÑÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð² ÑÐ°Ð·Ð¸ Ð³ÑÑÐ¿Ð°."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -510,17 +515,17 @@ msgid "Invalid token."
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ ÑÐ°Ð·Ð¼ÐµÑ."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -553,12 +558,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "ÐÐµÐ¾ÑÐ°ÐºÐ²Ð°Ð½Ð¾ Ð¸Ð·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° ÑÐ¾ÑÐ¼Ð°."
 
@@ -814,27 +822,44 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "ÐÐµ"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "ÐÐ° Ð½Ðµ ÑÐµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ° ÑÐ¾Ð·Ð¸ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "ÐÐ°"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð¿Ð¸ÑÐ²Ð°Ð½Ðµ Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð·Ð° Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½ÐµÑÐ¾."
 
@@ -847,8 +872,8 @@ msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð¿Ð¸ÑÐ²Ð°Ð½Ðµ Ð´Ð°Ð½Ð½Ð¸ÑÐµ Ð·Ð° Ð±Ð»Ð¾ÐºÐ¸Ñ
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "ÐÑÐ¼Ð° ÑÐ°ÐºÐ°Ð²Ð° Ð³ÑÑÐ¿Ð°"
 
@@ -908,16 +933,24 @@ msgstr "ÐÐµÑÐ°Ð·Ð¿Ð¾Ð·Ð½Ð°Ñ Ð²Ð¸Ð´ Ð°Ð´ÑÐµÑ %s"
 msgid "That address has already been confirmed."
 msgstr "Ð¢Ð¾Ð·Ð¸ Ð°Ð´ÑÐµÑ Ðµ Ð²ÐµÑÐµ Ð¿Ð¾ÑÐ²ÑÑÐ´ÐµÐ½."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¸Ð·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸ÐµÑÐ¾ Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑÐ°."
 
@@ -973,12 +1006,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "ÐÐ° Ð½Ðµ ÑÐµ Ð¸Ð·ÑÑÐ¸Ð²Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ°"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "ÐÐ·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ°"
@@ -1012,11 +1047,13 @@ msgstr "ÐÐ·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ°"
 msgid "Are you sure you want to delete this notice?"
 msgstr "ÐÐ°Ð¸ÑÑÐ¸Ð½Ð° Ð»Ð¸ Ð¸ÑÐºÐ°ÑÐµ Ð´Ð° Ð¸Ð·ÑÑÐ¸ÐµÑÐµ ÑÐ°Ð·Ð¸ Ð±ÐµÐ»ÐµÐ¶ÐºÐ°?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "ÐÐ° Ð½Ðµ ÑÐµ Ð¸Ð·ÑÑÐ¸Ð²Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ°"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "ÐÐ·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ°"
 
@@ -1038,7 +1075,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "ÐÐ·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð½Ð° ÑÐ¾Ð·Ð¸ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»"
 
@@ -1154,15 +1192,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ÐÐ°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ"
 
@@ -1295,31 +1331,43 @@ msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÐ±ÐµÐ»ÑÐ·Ð²Ð°Ð½Ðµ ÐºÐ°ÑÐ¾ Ð»ÑÐ±Ð¸Ð¼Ð°."
 msgid "Options saved."
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ ÑÐ° Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð¸."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð½Ð° Ð¿Ð¾ÑÐ°ÑÐ°, Ð¸Ð´Ð²Ð°ÑÐ° Ð¾Ñ %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "ÐÐ´ÑÐµÑ"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "ÐÐ´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Ð¢ÐµÐºÑÑ Ð¿Ð¾ÑÐ²ÑÑÐ´ÐµÐ½ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "ÐÑÐµÐ¼Ð°ÑÐ²Ð°Ð½Ðµ"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1327,107 +1375,142 @@ msgstr ""
 "ÐÑÐ°ÐºÐ²Ð° ÑÐµ Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð·Ð° ÑÐ¾Ð·Ð¸ Ð°Ð´ÑÐµÑ. ÐÑÐ¾Ð²ÐµÑÐµÑÐµ ÐºÑÑÐ¸ÑÑÐ° ÑÐ¸ (Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ°ÑÐ° Ð·Ð° "
 "ÑÐ¿Ð°Ð¼) Ð·Ð° ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ðµ Ñ ÑÐºÐ°Ð·Ð°Ð½Ð¸Ñ."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ÐÑÐºÐ°Ð·"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "ÐÐ´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ÐÐ´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°, ÐºÐ°ÑÐ¾ \"UserName@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "ÐÐ¾Ð±Ð°Ð²ÑÐ½Ðµ"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ÐÑÐ¾Ð´ÑÑÐ° Ð¿Ð¾ÑÐ°"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐµÑÐµ Ð¿Ð¸ÑÐ¼Ð¾ Ð´Ð¾ ÑÐ¾Ð·Ð¸ Ð°Ð´ÑÐµÑ Ð·Ð° Ð¿ÑÐ±Ð»Ð¸ÐºÑÐ²Ð°Ð½Ðµ ÐºÐ°ÑÐ¾ Ð±ÐµÐ»ÐµÐ¶ÐºÐ°."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "ÐÐ°Ð´Ð°Ð²Ð°Ð½Ðµ Ð½Ð° Ð½Ð¾Ð²Ð° Ðµ-Ð¿Ð¾ÑÐ°, Ð¾Ñ ÐºÐ¾ÑÑÐ¾ Ð´Ð° ÑÐµ Ð¿ÑÐ±Ð»Ð¸ÐºÑÐ²Ð°. ÐÑÐ¼ÐµÐ½Ñ Ð¿ÑÐµÐ´Ð¸ÑÐ½Ð°ÑÐ°."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "ÐÐ¾Ð²Ð¾"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð·Ð° Ð½Ð¾Ð²Ð¸ Ð°Ð±Ð¾Ð½Ð°Ð¼ÐµÐ½ÑÐ¸ Ð¿Ð¾ Ð¿Ð¾ÑÐ°ÑÐ°."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¸ÑÐ¼Ð¾ Ð¿ÑÐ¸ Ð¾ÑÐ±ÐµÐ»ÑÐ·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¼Ð¾Ñ Ð±ÐµÐ»ÐµÐ¶ÐºÐ° ÐºÐ°ÑÐ¾ Ð»ÑÐ±Ð¸Ð¼Ð°."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¸ÑÐ¼Ð¾ Ð¿ÑÐ¸ Ð½Ð¾Ð²Ð¾ Ð»Ð¸ÑÐ½Ð¾ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ðµ."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° Ð¿Ð¸ÑÐ¼Ð¾ Ð¿ÑÐ¸ Ð½Ð¾Ð²Ð¾ Ð»Ð¸ÑÐ½Ð¾ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ðµ."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "ÐÑÐºÐ°Ð¼ Ð´Ð° Ð¸Ð·Ð¿ÑÐ°ÑÐ°Ð¼ Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸ Ð¿Ð¾ Ð¿Ð¾ÑÐ°ÑÐ°."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "ÐÑÐ±Ð»Ð¸ÐºÑÐ²Ð°Ð½Ðµ Ð½Ð° MicroID Ð·Ð° Ð°Ð´ÑÐµÑÐ° Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°ÑÐ°."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ ÑÐ° Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð¸."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "ÐÐµ Ðµ Ð²ÑÐ²ÐµÐ´ÐµÐ½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð½Ð¾ÑÐ¼Ð°Ð»Ð¸Ð·Ð¸ÑÐ°Ð½Ðµ Ð°Ð´ÑÐµÑÐ° Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°ÑÐ°"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Ð¢Ð¾Ð²Ð° Ð¸ ÑÐµÐ³Ð° Ðµ Ð°Ð´ÑÐµÑÑÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°ÑÐ° Ð²Ð¸."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Ð¢Ð°Ð·Ð¸ Ðµ-Ð¿Ð¾ÑÐ° Ð²ÐµÑÐµ ÑÐµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð¾Ñ Ð´ÑÑÐ³ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð²Ð¼ÑÐºÐ½Ðµ ÐºÐ¾Ð´ Ð·Ð° Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ðµ."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1436,43 +1519,56 @@ msgstr ""
 "ÐÑÐ¾Ð²ÐµÑÐµÑÐµ ÐºÑÑÐ¸ÑÑÐ° (Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ°ÑÐ° Ð·Ð° ÑÐ¿Ð°Ð¼) Ð·Ð° ÐºÐ¾Ð´Ð° Ð¸ ÑÐºÐ°Ð·Ð°Ð½Ð¸ÑÑÐ° Ð·Ð° Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½ÐµÑÐ¾ "
 "Ð¼Ñ."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ÐÑÐ¼Ð° Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ñ, Ð¾ÑÐ°ÐºÐ²Ð°ÑÐ¸ Ð´Ð° Ð±ÑÐ´Ð°Ñ Ð¾ÑÐºÐ°Ð·Ð°Ð½Ð¸."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "ÐÑÐµÑÐµÐ½ IM Ð°Ð´ÑÐµÑ."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "ÐÐ¾ÑÐ²ÑÑÐ¶Ð´Ð°Ð²Ð°Ð½ÐµÑÐ¾ Ðµ Ð¿ÑÐµÐºÑÑÐ½Ð°ÑÐ¾."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Ð¢Ð¾Ð²Ð° Ð½Ðµ Ðµ Ð²Ð°ÑÐ¸ÑÑ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "ÐÐ´ÑÐµÑÑÑ Ðµ Ð¿ÑÐµÐ¼Ð°ÑÐ½Ð°Ñ."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÐÑÐ¼Ð° Ð²ÑÐ¾Ð´ÑÑ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð·Ð°Ð¿Ð¸ÑÐ° Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ÐÑÐ¾Ð´ÑÑÐ¸ÑÑ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ° Ðµ Ð¿ÑÐµÐ¼Ð°ÑÐ½Ð°Ñ."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ÐÐ¾Ð±Ð°Ð²ÐµÐ½ Ðµ Ð½Ð¾Ð² Ð²ÑÐ¾Ð´ÑÑ Ð°Ð´ÑÐµÑ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°."
 
@@ -1665,17 +1761,19 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 #, fuzzy
 msgid "Do not block this user from this group"
 msgstr "Ð¡Ð¿Ð¸ÑÑÐº Ñ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸ÑÐµ Ð² ÑÐ°Ð·Ð¸ Ð³ÑÑÐ¿Ð°."
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 #, fuzzy
 msgid "Block this user from this group"
 msgstr "Ð¡Ð¿Ð¸ÑÑÐº Ñ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸ÑÐµ Ð² ÑÐ°Ð·Ð¸ Ð³ÑÑÐ¿Ð°."
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1852,12 +1950,16 @@ msgstr "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ð²Ð¸ Ðµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð»."
 msgid "Error removing the block."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð¿Ð°Ð·Ð²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "IM Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1866,16 +1968,26 @@ msgstr ""
 "ÐÐ¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿Ð¾Ð»ÑÑÐ°Ð²Ð°ÑÐµ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ Jabber/GTalk [instant messages](%%doc.im%"
 "%). ÐÑÐ²ÐµÐ´ÐµÑÐµ Ð°Ð´ÑÐµÑÐ° ÑÐ¸ Ð² Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ Ð¿Ð¾-Ð´Ð¾Ð»Ñ."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 #, fuzzy
 msgid "IM is not available."
 msgstr "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° Ð½Ðµ Ðµ Ð´Ð¾ÑÑÑÐ¿Ð½Ð° Ð²ÑÐ² Ð²Ð¸Ð´Ð° Ð¼ÐµÐ´Ð¸Ñ, ÐºÐ¾Ð¹ÑÐ¾ Ð¿ÑÐ¸ÐµÐ¼Ð°ÑÐµ"
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "IM Ð°Ð´ÑÐµÑ"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Ð¢ÐµÐºÑÑ Ð¿Ð¾ÑÐ²ÑÑÐ´ÐµÐ½ Jabber/GTalk Ð°Ð´ÑÐµÑ."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1884,12 +1996,9 @@ msgstr ""
 "OÑÐ°ÐºÐ²Ð° ÑÐµ Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð½Ð° ÑÐ¾Ð·Ð¸ Ð°Ð´ÑÐµÑ. ÐÑÐ¾Ð²ÐµÑÐµÑÐµ Ð°ÐºÐ°ÑÐ½ÑÐ° ÑÐ¸ Ð² Jabber/GTalk Ð·Ð° "
 "ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ðµ Ñ Ð¸Ð½ÑÑÑÑÐºÑÐ¸Ð¸. (ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑÐµ Ð»Ð¸ %s Ð² ÑÐ¿Ð¸ÑÑÐºÐ° ÑÐ¸ ÑÐ°Ð¼?)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "IM Ð°Ð´ÑÐµÑ"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1898,43 +2007,65 @@ msgstr ""
 "Jabber Ð¸Ð»Ð¸ GTalk Ð°Ð´ÑÐµÑ, ÐºÐ°ÑÐ¾ \"UserName@example.org\". ÐÑÑÐ²Ð¾ ÑÐµ ÑÐ²ÐµÑÐµÑÐµ, ÑÐµ "
 "ÑÑÐµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ %s Ð² ÑÐ¿Ð¸ÑÑÐºÐ° ÑÐ¸ Ñ Ð¿ÑÐ¸ÑÑÐµÐ»Ð¸ Ð² IM Ð¸Ð»Ð¸ GTalk ÐºÐ»Ð¸ÐµÐ½ÑÐ° ÑÐ¸."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸ÑÐµ Ð¿Ð¾ Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "ÐÑÐ±Ð»Ð¸ÐºÑÐ²Ð°Ð½Ðµ Ð¿ÑÐ¾Ð¼ÑÐ½Ð°ÑÐ° Ð½Ð° ÑÑÑÑÐ¾ÑÐ½Ð¸ÐµÑÐ¾ Ð¼Ð¸ Ð² Jabber/GTalk."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð¿Ð¾ Jabber/GTalk Ð½Ð° Ð¾ÑÐ³Ð¾Ð²Ð¾ÑÐ¸ Ð¾Ñ ÑÐ¾ÑÐ°, "
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ÐÑÐ±Ð»Ð¸ÐºÑÐ²Ð°Ð½Ðµ Ð½Ð° MicroID Ð·Ð° Ð°Ð´ÑÐµÑÐ° Ð² Jabber/GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ ÑÐ° Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð¸."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "ÐÑÐ¼Ð° Jabber ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð½Ð¾ÑÐ¼Ð°Ð»Ð¸Ð·Ð°ÑÐ¸Ñ Ð½Ð° ÑÐ¾Ð·Ð¸ Jabber ID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ Jabber ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Ð¢Ð¾Ð²Ð° Ð²ÐµÑÐµ Ðµ Ð²Ð°ÑÐ¸ÑÑ Jabber ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Ð¢Ð¾Ð·Ð¸ Jabber ID Ð¿ÑÐ¸Ð½Ð°Ð´Ð»ÐµÐ¶Ð¸ Ð½Ð° Ð´ÑÑÐ³ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1943,10 +2074,35 @@ msgstr ""
 "ÐÐ° Ð¼ÐµÑÐ¸Ð½Ð´Ð¶ÑÑÐ° Ð²Ð¸ Ðµ Ð¸Ð·Ð¿ÑÐ°ÑÐµÐ½ ÐºÐ¾Ð´ Ð·Ð° Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ðµ. ÐÐ° Ð´Ð° Ð¿Ð¾Ð»ÑÑÐ°Ð²Ð°ÑÐµ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ "
 "Ð¾Ñ %s, ÑÑÑÐ±Ð²Ð° Ð´Ð° Ð³Ð¾ Ð¾Ð´Ð¾Ð±ÑÐ¸ÑÐµ."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "ÐÑÐµÑÐµÐ½ IM Ð°Ð´ÑÐµÑ."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¸Ð·ÑÑÐ¸Ð²Ð°Ð½Ðµ Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸ÐµÑÐ¾ Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑÐ°."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "ÐÐ¾ÑÐ²ÑÑÐ¶Ð´Ð°Ð²Ð°Ð½ÐµÑÐ¾ Ðµ Ð¿ÑÐµÐºÑÑÐ½Ð°ÑÐ¾."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Ð¢Ð¾Ð²Ð° Ð½Ðµ Ðµ Ð²Ð°ÑÐ¸ÑÑ Jabber ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "ÐÐ´ÑÐµÑÑÑ Ðµ Ð¿ÑÐµÐ¼Ð°ÑÐ½Ð°Ñ."
+
 #: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1987,7 +2143,9 @@ msgstr "ÐÐ¾ÐºÐ°Ð½Ð¸ Ð·Ð° Ð½Ð¾Ð²Ð¸ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸"
 msgid "You are already subscribed to these users:"
 msgstr "ÐÐµÑÐµ ÑÑÐµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ð½Ð¸ Ð·Ð° ÑÐ»ÐµÐ´Ð½Ð¸ÑÐµ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2112,7 +2270,9 @@ msgstr "ÐÐ° Ð´Ð° ÑÐµ Ð¿ÑÐ¸ÑÑÐµÐ´Ð¸Ð½Ð¸ÑÐµ ÐºÑÐ¼ Ð³ÑÑÐ¿Ð°, ÑÑÑÐ±Ð²Ð°
 msgid "No nickname or ID."
 msgstr "ÐÑÐ¼Ð° Ð¿ÑÐµÐ²Ð´Ð¾Ð½Ð¸Ð¼."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, fuzzy, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%s ÑÐµ Ð¿ÑÐ¸ÑÑÐµÐ´Ð¸Ð½Ð¸ ÐºÑÐ¼ Ð³ÑÑÐ¿Ð°ÑÐ° %s"
@@ -2121,11 +2281,13 @@ msgstr "%s ÑÐµ Ð¿ÑÐ¸ÑÑÐµÐ´Ð¸Ð½Ð¸ ÐºÑÐ¼ Ð³ÑÑÐ¿Ð°ÑÐ° %s"
 msgid "You must be logged in to leave a group."
 msgstr "ÐÐ° Ð½Ð°Ð¿ÑÑÐ½ÐµÑÐµ Ð³ÑÑÐ¿Ð°, ÑÑÑÐ±Ð²Ð° Ð´Ð° ÑÑÐµ Ð²Ð»ÐµÐ·Ð»Ð¸."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "ÐÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð² ÑÐ°Ð·Ð¸ Ð³ÑÑÐ¿Ð°."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s Ð½Ð°Ð¿ÑÑÐ½Ð° Ð³ÑÑÐ¿Ð°ÑÐ° %2$s"
@@ -2239,12 +2401,12 @@ msgstr "ÐÐ·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð¹ÑÐµ ÑÐ°Ð·Ð¸ Ð±Ð»Ð°Ð½ÐºÐ° Ð·Ð° ÑÑÐ·Ð´Ð°Ð²Ð°Ð½Ðµ Ð½
 msgid "New message"
 msgstr "ÐÐ¾Ð²Ð¾ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ðµ"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð·Ð¿ÑÐ°ÑÐ°ÑÐµ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ Ð´Ð¾ ÑÐ¾Ð·Ð¸ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "ÐÑÐ¼Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ!"
 
@@ -2252,7 +2414,7 @@ msgstr "ÐÑÐ¼Ð° ÑÑÐ´ÑÑÐ¶Ð°Ð½Ð¸Ðµ!"
 msgid "No recipient specified."
 msgstr "ÐÐµ Ðµ ÑÐºÐ°Ð·Ð°Ð½ Ð¿Ð¾Ð»ÑÑÐ°ÑÐµÐ»."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2514,7 +2676,7 @@ msgid "6 or more characters"
 msgstr "6 Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÐµÑÐµ Ð·Ð½Ð°ÐºÐ°"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "ÐÐ¾ÑÐ²ÑÑÐ¶Ð´Ð°Ð²Ð°Ð½Ðµ"
 
@@ -3860,45 +4022,75 @@ msgstr ""
 msgid "Save site notice"
 msgstr "ÐÐ¾Ð²Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð·Ð° SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "ÐÐ¾Ð¶Ðµ Ð´Ð° Ð¿Ð¾Ð»ÑÑÐ°Ð²Ð°ÑÐµ Ð½Ð° Ðµ-Ð¿Ð¾ÑÐ°ÑÐ° ÑÐ¸ SMS-ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ñ Ð¾Ñ %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Ð¡ÑÑÐ°Ð½Ð¸ÑÐ°ÑÐ° Ð½Ðµ Ðµ Ð´Ð¾ÑÑÑÐ¿Ð½Ð° Ð²ÑÐ² Ð²Ð¸Ð´Ð° Ð¼ÐµÐ´Ð¸Ñ, ÐºÐ¾Ð¹ÑÐ¾ Ð¿ÑÐ¸ÐµÐ¼Ð°ÑÐµ"
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM Ð°Ð´ÑÐµÑ"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Ð¢ÐµÐºÑÑ Ð¿Ð¾ÑÐ²ÑÑÐ´ÐµÐ½ ÑÐµÐ»ÐµÑÐ¾Ð½ÐµÐ½ Ð½Ð¾Ð¼ÐµÑ Ð·Ð° SMS-Ð¸."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "ÐÑÐ°ÐºÐ²Ð° ÑÐµ Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð·Ð° ÑÐ¾Ð·Ð¸ ÑÐµÐ»ÐµÑÐ¾Ð½ÐµÐ½ Ð½Ð¾Ð¼ÐµÑ."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "ÐÐ¾Ð´ Ð·Ð° Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "ÐÑÐ²ÐµÐ´ÐµÑÐµ ÐºÐ¾Ð´Ð°, ÐºÐ¾Ð¹ÑÐ¾ Ð¿Ð¾Ð»ÑÑÐ¸ÑÑÐµ Ð¿Ð¾ ÑÐµÐ»ÐµÑÐ¾Ð½Ð°."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "ÐÐ¾ÑÐ²ÑÑÐ¶Ð´Ð°Ð²Ð°Ð½Ðµ"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "Ð¢ÐµÐ»ÐµÑÐ¾Ð½ÐµÐ½ Ð½Ð¾Ð¼ÐµÑ Ð·Ð° SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Ð¢ÐµÐ»ÐµÑÐ¾Ð½ÐµÐ½ Ð½Ð¾Ð¼ÐµÑ â Ñ ÐºÐ¾Ð´, Ð±ÐµÐ· Ð¿ÑÐ½ÐºÑÐ¾Ð°ÑÐ¸Ñ Ð¸ Ð±ÐµÐ· Ð¸Ð½ÑÐµÑÐ²Ð°Ð»Ð¸."
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3906,23 +4098,34 @@ msgstr ""
 "ÐÐ¾Ð»ÑÑÐ°Ð²Ð°Ð½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ¸ Ð² SMS. ÐÐ¼Ð°Ð¹ÑÐµ Ð¿ÑÐµÐ´Ð²Ð¸Ð´, ÑÐµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð¸Ð¼Ð° Ð´Ð¾Ð¿ÑÐ»Ð½Ð¸ÑÐµÐ»Ð½Ð¸ "
 "ÑÐ°ÐºÑÐ¸ Ð¾Ñ Ð¾Ð¿ÐµÑÐ°ÑÐ¾ÑÐ°."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ÑÐµ ÑÐ° Ð·Ð°Ð¿Ð°Ð·ÐµÐ½Ð¸."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "ÐÐµ Ðµ Ð²ÑÐ²ÐµÐ´ÐµÐ½ ÑÐµÐ»ÐµÑÐ¾Ð½ÐµÐ½ Ð½Ð¾Ð¼ÐµÑ."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "ÐÐµ Ðµ Ð¸Ð·Ð±ÑÐ°Ð½ Ð¾Ð¿ÐµÑÐ°ÑÐ¾Ñ."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Ð¢Ð¾Ð²Ð° Ð¸ ÑÐµÐ³Ð° Ðµ Ð½Ð¾Ð¼ÐµÑÑÑ Ð½Ð° ÑÐµÐ»ÐµÑÐ¾Ð½Ð° Ð²Ð¸."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Ð¢Ð¾Ð·Ð¸ ÑÐµÐ»ÐµÑÐ¾Ð½ÐµÐ½ Ð½Ð¾Ð¼ÐµÑ Ð²ÐµÑÐµ ÑÐµ Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð° Ð¾Ñ Ð´ÑÑÐ³ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -3932,23 +4135,42 @@ msgstr ""
 "ÐÑÐ¾Ð²ÐµÑÐµÑÐµ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸ÑÑÐ° (Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ°ÑÐ° Ð·Ð° ÑÐ¿Ð°Ð¼) Ð·Ð° ÐºÐ¾Ð´Ð° Ð¸ ÑÐºÐ°Ð·Ð°Ð½Ð¸ÑÑÐ° Ð·Ð° "
 "Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½ÐµÑÐ¾ Ð¼Ñ."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Ð¢Ð¾Ð·Ð¸ ÐºÐ¾Ð´ Ð·Ð° Ð¿Ð¾ÑÐ²ÑÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ðµ Ð³ÑÐµÑÐµÐ½."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "ÐÐ¾ÑÐ²ÑÑÐ¶Ð´Ð°Ð²Ð°Ð½ÐµÑÐ¾ Ðµ Ð¿ÑÐµÐºÑÑÐ½Ð°ÑÐ¾."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Ð¢Ð¾Ð²Ð° Ð½Ðµ Ðµ Ð²Ð°ÑÐ¸ÑÑ ÑÐµÐ»ÐµÑÐ¾Ð½ÐµÐ½ Ð½Ð¾Ð¼ÐµÑ."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Ð¢ÐµÐ»ÐµÑÐ¾Ð½ÐµÐ½ Ð½Ð¾Ð¼ÐµÑ Ð·Ð° SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "ÐÐ¾Ð±Ð¸Ð»ÐµÐ½ Ð¾Ð¿ÐµÑÐ°ÑÐ¾Ñ"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "ÐÐ·Ð±ÐµÑÐµÑÐµ Ð¾Ð¿ÐµÑÐ°ÑÐ¾Ñ"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3957,7 +4179,8 @@ msgstr ""
 "ÐÐ¾Ð±Ð¸Ð»ÐµÐ½ Ð¾Ð¿ÐµÑÐ°ÑÐ¾Ñ Ð·Ð° SMS. ÐÐºÐ¾ Ð·Ð½Ð°ÐµÑÐµ Ð¾Ð¿ÐµÑÐ°ÑÐ¾Ñ, Ð¿Ð¾Ð´Ð´ÑÑÐ¶Ð°Ñ SMS Ð¾Ñ Ðµ-Ð¿Ð¾ÑÐ°, ÐºÐ¾Ð¹ÑÐ¾ "
 "Ð½Ðµ ÑÐ¸Ð³ÑÑÐ¸ÑÐ° ÑÑÐº, Ð¿Ð¸ÑÐµÑÐµ Ð½Ð¸ Ð½Ð° Ð°Ð´ÑÐµÑ %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "ÐÐµ Ðµ Ð²ÑÐ²ÐµÐ´ÐµÐ½ ÐºÐ¾Ð´."
 
@@ -5174,10 +5397,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "ÐÑÐºÐ°Ð·"
 
@@ -5254,34 +5475,40 @@ msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¸Ð·Ð¿ÑÐ»Ð½ÐµÐ½Ð¸Ðµ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°ÑÐ°"
 msgid "Notice with that id does not exist"
 msgstr "ÐÐµ Ðµ Ð¾ÑÐºÑÐ¸ÑÐ° Ð±ÐµÐ»ÐµÐ¶ÐºÐ° Ñ ÑÐ°ÐºÑÐ² Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¾Ñ."
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "ÐÐ¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ð½ÑÐ¼Ð° Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» Ñ Ð¿Ð¾ÑÐ²ÑÑÐ´ÐµÐ½ email Ð°Ð´ÑÐµÑ."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾Ð±Ð½Ð¾Ð²ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» Ñ Ð¿Ð¾ÑÐ²ÑÑÐ´ÐµÐ½ email Ð°Ð´ÑÐµÑ."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "ÐÐ° ÑÑÐ¶Ð°Ð»ÐµÐ½Ð¸Ðµ ÑÐ°Ð·Ð¸ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐµ Ð¾ÑÐµ Ð½Ðµ ÑÐµ Ð¿Ð¾Ð´Ð´ÑÑÐ¶Ð°."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "ÐÐ·Ð¿ÑÐ°ÑÐµÐ½Ð¾ Ðµ Ð¿Ð¾Ð±ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5292,198 +5519,203 @@ msgstr ""
 "ÐÐ±Ð¾Ð½Ð°ÑÐ¸: %2$s\n"
 "ÐÐµÐ»ÐµÐ¶ÐºÐ¸: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "ÐÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ° Ðµ Ð¾ÑÐ±ÐµÐ»ÑÐ·Ð°Ð½Ð° ÐºÐ°ÑÐ¾ Ð»ÑÐ±Ð¸Ð¼Ð°."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "ÐÐµÑÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð² ÑÐ°Ð·Ð¸ Ð³ÑÑÐ¿Ð°."
 
-#: lib/command.php:331
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿ÑÐ¾ÑÐ»ÐµÐ´ÑÐ²Ð°Ð½Ðµ â Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ð½Ðµ Ðµ Ð½Ð°Ð¼ÐµÑÐµÐ½."
 
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s ÑÐµ Ð¿ÑÐ¸ÑÑÐµÐ´Ð¸Ð½Ð¸ ÐºÑÐ¼ Ð³ÑÑÐ¿Ð°ÑÐ° %s"
-
-#: lib/command.php:373
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
 #, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿ÑÐ¾ÑÐ»ÐµÐ´ÑÐ²Ð°Ð½Ðµ â Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»ÑÑ Ð½Ðµ Ðµ Ð½Ð°Ð¼ÐµÑÐµÐ½."
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s Ð½Ð°Ð¿ÑÑÐ½Ð° Ð³ÑÑÐ¿Ð°ÑÐ° %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "ÐÑÐ»Ð½Ð¾ Ð¸Ð¼Ðµ: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "ÐÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "ÐÐ¾Ð¼Ð°ÑÐ½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "ÐÑÐ½Ð¾ÑÐ½Ð¾: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
-"Ð¡ÑÐ¾Ð±ÑÐµÐ½Ð¸ÐµÑÐ¾ Ðµ ÑÐ²ÑÑÐ´Ðµ Ð´ÑÐ»Ð³Ð¾. ÐÐ°Ð¹-Ð¼Ð½Ð¾Ð³Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ðµ 140 Ð·Ð½Ð°ÐºÐ°, Ð° ÑÑÐµ Ð²ÑÐ²ÐµÐ»Ð¸ %d."
+"Ð¡ÑÐ¾Ð±ÑÐµÐ½Ð¸ÐµÑÐ¾ Ðµ ÑÐ²ÑÑÐ´Ðµ Ð´ÑÐ»Ð³Ð¾. ÐÐ°Ð¹-Ð¼Ð½Ð¾Ð³Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ðµ %1$d Ð·Ð½Ð°ÐºÐ°, Ð° ÑÑÐµ Ð²ÑÐ²ÐµÐ»Ð¸ %2"
+"$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "ÐÑÑÐºÐ¾ÑÐ¾ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ðµ Ð´Ð¾ %s Ðµ Ð¸Ð·Ð¿ÑÐ°ÑÐµÐ½Ð¾."
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¸Ð·Ð¿ÑÐ°ÑÐ°Ð½Ðµ Ð½Ð° Ð¿ÑÑÐºÐ¾ÑÐ¾ ÑÑÐ¾Ð±ÑÐµÐ½Ð¸Ðµ"
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿Ð¾Ð²ÑÐ°ÑÑÑÐµ ÑÐ¾Ð±ÑÑÐ²ÐµÐ½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "ÐÐµÑÐµ ÑÑÐµ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸Ð»Ð¸ ÑÐ°Ð·Ð¸ Ð±ÐµÐ»ÐµÐ¶ÐºÐ°."
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "ÐÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ° Ð¾Ñ %s Ðµ Ð¿Ð¾Ð²ÑÐ¾ÑÐµÐ½Ð°"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾Ð²ÑÐ°ÑÑÐ½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ°."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 "Ð¡ÑÐ¾Ð±ÑÐµÐ½Ð¸ÐµÑÐ¾ Ðµ ÑÐ²ÑÑÐ´Ðµ Ð´ÑÐ»Ð³Ð¾. ÐÐ°Ð¹-Ð¼Ð½Ð¾Ð³Ð¾ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ðµ 140 Ð·Ð½Ð°ÐºÐ°, Ð° ÑÑÐµ Ð²ÑÐ²ÐµÐ»Ð¸ %d."
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "ÐÑÐ³Ð¾Ð²Ð¾ÑÑÑ Ð´Ð¾ %s Ðµ Ð¸Ð·Ð¿ÑÐ°ÑÐµÐ½"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð¿Ð¸ÑÐ²Ð°Ð½Ðµ Ð½Ð° Ð±ÐµÐ»ÐµÐ¶ÐºÐ°ÑÐ°."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Ð£ÑÐ¾ÑÐ½ÐµÑÐµ Ð¸Ð¼ÐµÑÐ¾ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ, Ð·Ð° ÐºÐ¾Ð³Ð¾ÑÐ¾ ÑÐµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°ÑÐµ."
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "ÐÐµ ÑÑÐµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ð½Ð¸ Ð·Ð° ÑÐ¾Ð·Ð¸ Ð¿ÑÐ¾ÑÐ¸Ð»"
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "ÐÐ±Ð¾Ð½Ð¸ÑÐ°Ð½Ð¸ ÑÑÐµ Ð·Ð° %s."
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Ð£ÑÐ¾ÑÐ½ÐµÑÐµ Ð¸Ð¼ÐµÑÐ¾ Ð½Ð° Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ñ, Ð¾Ñ ÐºÐ¾Ð³Ð¾ÑÐ¾ ÑÐµ Ð¾ÑÐ¿Ð¸ÑÐ²Ð°ÑÐµ."
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "ÐÑÐ¿Ð¸ÑÐ°Ð½Ð¸ ÑÑÐµ Ð¾Ñ %s."
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð°ÑÐ° Ð²ÑÐµ Ð¾ÑÐµ Ð½Ðµ ÑÐµ Ð¿Ð¾Ð´Ð´ÑÑÐ¶Ð°."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸ÐµÑÐ¾ Ðµ Ð¸Ð·ÐºÐ»ÑÑÐµÐ½Ð¾."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¸Ð·ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸ÐµÑÐ¾."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸ÐµÑÐ¾ Ðµ Ð²ÐºÐ»ÑÑÐµÐ½Ð¾."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð²ÐºÐ»ÑÑÐ²Ð°Ð½Ðµ Ð½Ð° ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸ÐµÑÐ¾."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "ÐÑÐ¿Ð¸ÑÐ°Ð½Ð¸ ÑÑÐµ Ð¾Ñ %s."
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "ÐÐµ ÑÑÐµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ð½Ð¸ Ð·Ð° Ð½Ð¸ÐºÐ¾Ð³Ð¾."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ÐÐµÑÐµ ÑÑÐµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ð½Ð¸ Ð·Ð° ÑÐ»ÐµÐ´Ð½Ð¸ÑÐµ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸:"
 msgstr[1] "ÐÐµÑÐµ ÑÑÐµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ð½Ð¸ Ð·Ð° ÑÐ»ÐµÐ´Ð½Ð¸ÑÐµ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ»Ð¸:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "ÐÐ¸ÐºÐ¾Ð¹ Ð½Ðµ Ðµ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ð½ Ð·Ð° Ð²Ð°Ñ."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ð½Ðµ Ð½Ð° Ð´ÑÑÐ³ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» Ð·Ð° Ð²Ð°Ñ."
 msgstr[1] "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð°Ð±Ð¾Ð½Ð¸ÑÐ°Ð½Ðµ Ð½Ð° Ð´ÑÑÐ³ Ð¿Ð¾ÑÑÐµÐ±Ð¸ÑÐµÐ» Ð·Ð° Ð²Ð°Ñ."
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "ÐÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð² Ð½Ð¸ÑÐ¾ ÐµÐ´Ð½Ð° Ð³ÑÑÐ¿Ð°."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ÐÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð² ÑÐ°Ð·Ð¸ Ð³ÑÑÐ¿Ð°."
 msgstr[1] "ÐÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð² ÑÐ°Ð·Ð¸ Ð³ÑÑÐ¿Ð°."
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6329,6 +6561,10 @@ msgstr "ÐÐ¸Ð¿ÑÐ²Ð°Ñ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¸ return-to."
 msgid "Repeat this notice?"
 msgstr "ÐÐ¾Ð²ÑÐ°ÑÑÐ½Ðµ Ð½Ð° ÑÐ°Ð·Ð¸ Ð±ÐµÐ»ÐµÐ¶ÐºÐ°"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "ÐÐ°"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "ÐÐ¾Ð²ÑÐ°ÑÑÐ½Ðµ Ð½Ð° ÑÐ°Ð·Ð¸ Ð±ÐµÐ»ÐµÐ¶ÐºÐ°"
@@ -6521,47 +6757,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "ÐÐ¾Ð´ÐµÑÐ°ÑÐ¾Ñ"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð½ÑÐºÐ¾Ð»ÐºÐ¾ ÑÐµÐºÑÐ½Ð´Ð¸"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ Ð¼Ð¸Ð½ÑÑÐ°"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ %d Ð¼Ð¸Ð½ÑÑÐ¸"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ ÑÐ°Ñ"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ %d ÑÐ°ÑÐ°"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ Ð´ÐµÐ½"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ %d Ð´Ð½Ð¸"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ Ð¼ÐµÑÐµÑ"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ %d Ð¼ÐµÑÐµÑÐ°"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "Ð¿ÑÐµÐ´Ð¸ Ð¾ÐºÐ¾Ð»Ð¾ Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index 68e61dbabf..d9fb1d0828 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:34:59+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:15+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: out-statusnet\n"
@@ -72,8 +72,13 @@ msgstr "Serr"
 msgid "Save access settings"
 msgstr "EnrollaÃ± an arventennoÃ¹ moned"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "EnrollaÃ±"
@@ -103,7 +108,7 @@ msgstr "N'eus ket eus ar bajenn-se."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "N'eus ket eus an implijer-se."
@@ -334,7 +339,7 @@ msgstr "N'eo bet kavet statud ebet gant an ID-maÃ±."
 msgid "This status is already a favorite."
 msgstr "Ur pennroll eo dija an ali-maÃ±."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Diposupl eo krouiÃ± ar pennroll-maÃ±."
 
@@ -451,7 +456,7 @@ msgstr "N'eo ket bet kavet ar strollad."
 msgid "You are already a member of that group."
 msgstr "Un ezel eus ar strollad-maÃ± eo dija."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "Stanket oc'h bet eus ar strollad-maÃ± gant ur merour."
 
@@ -502,17 +507,17 @@ msgid "Invalid token."
 msgstr "Fichenn direizh."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -543,12 +548,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Kinnig ar furmskrid dic'hortoz."
 
@@ -800,27 +808,44 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Ket"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Arabat stankaÃ± an implijer-maÃ±"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ya"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "StankaÃ± an implijer-maÃ±"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Diposubl eo enrollaÃ± an titouroÃ¹ stankaÃ±."
 
@@ -833,8 +858,8 @@ msgstr "Diposubl eo enrollaÃ± an titouroÃ¹ stankaÃ±."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "N'eus ket eus ar strollad-se."
 
@@ -894,16 +919,24 @@ msgstr "N'eo ket bet anavezet seurt ar chomlec'h %s"
 msgid "That address has already been confirmed."
 msgstr "Kadarnaet eo bet dija ar chomlec'h-maÃ±."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Diposubl eo hizivaat an implijer."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Diposubl eo dilemel ar postel kadarnadur."
 
@@ -955,11 +988,13 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Arabat eo dilemel ar poellad-maÃ±"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Dilemel ar poelad-se"
 
@@ -992,11 +1027,13 @@ msgstr "Dilemel un ali"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ha sur oc'h ho peus c'hoant dilemel an ali-maÃ± ?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Arabat dilemel an ali-maÃ±"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Dilemel an ali-maÃ±"
 
@@ -1018,7 +1055,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "DiverkaÃ± an implijer-maÃ±"
 
@@ -1129,15 +1167,13 @@ msgid "Reset back to default"
 msgstr "Adlakaat an arventennoÃ¹ dre ziouer"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "EnrollaÃ±"
 
@@ -1263,178 +1299,238 @@ msgstr "Diposubl eo krouiÃ± an aliasoÃ¹."
 msgid "Options saved."
 msgstr "Enrollet eo bet ho dibarzhioÃ¹."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ArventennoÃ¹ ar postel"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "MeraÃ± ar posteloÃ¹ a fell deoc'h resevout a-berzh %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Chomlec'h"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Chomlec'h postel"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Chomlec'h postel gwiriekaet er mare-maÃ±."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Dilemel"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "NullaÃ±"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Chomlec'h postel"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Chomlec'h postel, evel \"AnvImplijer@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "OuzhpennaÃ±"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Postel o tont"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Nevez"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "PenndibaboÃ¹"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Kas din ur postel pa lak unan bennak unan eus va alioÃ¹ evel pennroll."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Kas din ur postel pa gas unan bennak ur gemennadenn bersonel din."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Kas din ur postel pa gas unan bennak ur \"@-respont\" din."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "C'hoant am eus kas va alioÃ¹ dre bostel."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Embann ur MicroID evit ma chomlec'h postel."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "PenndibaboÃ¹ enrollet"
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Enrollet eo bet an arventennoÃ¹ design."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Chomlec'h postel ebet."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "N'eo ket ur chomlec'h postel reizh."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Ho postel eo dija."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr ""
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Nullet eo bet ar gadarnadenn."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "N'eo ket ho postel."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Dilamet eo bet ar chomlec'h."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Chomlec'h postel ebet o tont."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr ""
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1617,15 +1713,17 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Arabat stankaÃ± an implijer-maÃ± eus ar strollad."
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "StankaÃ± an implijer-maÃ± eus ar strollad-se"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1795,90 +1893,148 @@ msgstr "N'eo ket stanket an implijer-maÃ± eus ar strollad."
 msgid "Error removing the block."
 msgstr "Ur fazi a zo bet e-pad nulladenn ar stankadenn."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "ArventennoÃ¹ ar bostelerezh prim"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "Dizimplijadus eo ar bostelerezh prim"
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Chomlec'h postelerezh prim"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Chomlec'h Jabber/GTalk kadarnaet er mare-maÃ±."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Chomlec'h postelerezh prim"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "PenndibaboÃ¹"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Kas din an alioÃ¹ dre Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "PenndibaboÃ¹ enrollet"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "ID Jabber ebet."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Diposubl eo implijout an ID Jabber-maÃ±"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "N'eo ket un ID Jabber reizh."
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Ho ID Jabber eo dija"
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Implijet eo an Jabber ID-maÃ± gant un implijer all."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Diposubl eo dilemel ar postel kadarnadur."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Nullet eo bet ar gadarnadenn."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "N'eo ket ho ID Jabber."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Dilamet eo bet ar chomlec'h."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1919,7 +2075,9 @@ msgstr "PediÃ± implijerien nevez"
 msgid "You are already subscribed to these users:"
 msgstr "Koumanantet oc'h dija d'an implijerien-maÃ± :"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2014,7 +2172,9 @@ msgstr "Rankout a reoc'h bezaÃ± luget evit mont en ur strollad."
 msgid "No nickname or ID."
 msgstr "Lesanv pe ID ebet."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s a zo bet er strollad %2$s"
@@ -2023,11 +2183,13 @@ msgstr "%1$s a zo bet er strollad %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Ret eo deoc'h bezaÃ± kevreet evit kuitaat ur strollad"
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "N'oc'h ket un ezel eus ar strollad-maÃ±."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s en deus kuitaet ar strollad %2$s"
@@ -2140,12 +2302,12 @@ msgstr "Implijit ar furmskrid-maÃ± a-benn krouiÃ± ur strollad nevez."
 msgid "New message"
 msgstr "Kemennadenn nevez"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Ne c'helloc'h ket kas kemennadennoÃ¹ d'an implijer-maÃ±."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Goullo eo !"
 
@@ -2153,7 +2315,7 @@ msgstr "Goullo eo !"
 msgid "No recipient specified."
 msgstr "N'o peus ket lakaet a resever."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2402,7 +2564,7 @@ msgid "6 or more characters"
 msgstr "6 arouezenn pe muioc'h"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Kadarnaat"
 
@@ -3701,95 +3863,156 @@ msgstr ""
 msgid "Save site notice"
 msgstr "EnrollaÃ± ali ul lec'hienn"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "ArventennoÃ¹ SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "Dizimplijadus eo an SMS."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Chomlec'h postelerezh prim"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Kod kadarnaat"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Kadarnaat"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "Niverenn bellgomz evit an SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "PenndibaboÃ¹"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "PenndibaboÃ¹ enrollet"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Niverenn bellgomz ebet."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Ho niverenn pellgomz eo dija."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "D'un implijer all eo an niverenn-maÃ± dija."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Direizh eo ar c'hod gwiriekaat-maÃ±."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Nullet eo bet ar gadarnadenn."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "n'eo ket ho niverenn pellgomz."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Niverenn bellgomz evit an SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Dibab un douger"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "N'eo bet lakaet kod ebet"
 
@@ -4933,10 +5156,8 @@ msgstr "Lenn-skrivaÃ±"
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "NullaÃ±"
 
@@ -5012,34 +5233,40 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr ""
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr ""
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr ""
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Blinkadenn kaset da %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5047,198 +5274,204 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr ""
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Dibosupl eo enskrivaÃ± an implijer %s d'ar strollad %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "emezelet eo %s er strollad %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr ""
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Diposubl eo stagaÃ± an implijer %1$s d'ar strollad %2$s."
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s {{Gender:.|en|he}} deus kuitaet ar strollad %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
+msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s."
 
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Anv klok : %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Lec'hiadur : %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Lec'hienn Web : %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Diwar-benn : %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
+"Re hir eo ar gemennadenn - ar ment brasaÃ± a zo %1$d arouezenn, %2$d "
+"arouezenn o peus lakaet."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Kaset eo bet ar gemennadenn war eeun da %s."
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr ""
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr ""
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr ""
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr ""
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Respont kaset da %s"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr ""
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "Digoumanantet eus %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr ""
 
-#: lib/command.php:754
+#: lib/command.php:780
 #, fuzzy
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "You are subscribed to this person:"
 msgstr[1] "You are subscribed to these people:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr ""
 
-#: lib/command.php:776
+#: lib/command.php:802
 #, fuzzy
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "This person is subscribed to you:"
 msgstr[1] "These people are subscribed to you:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr ""
 
-#: lib/command.php:798
+#: lib/command.php:824
 #, fuzzy
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "You are a member of this group:"
 msgstr[1] "You are a member of these groups:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6059,6 +6292,10 @@ msgstr ""
 msgid "Repeat this notice?"
 msgstr "AdkregiÃ± gant an ali-maÃ± ?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ya"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "AdkregiÃ± gant an ali-maÃ±"
@@ -6246,47 +6483,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Habasker"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "un nebeud eilennoÃ¹ zo"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "1 vunutenn zo well-wazh"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d munutenn zo well-wazh"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "1 eurvezh zo well-wazh"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d eurvezh zo well-wazh"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "1 devezh zo well-wazh"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "%d devezh zo well-wazh"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "miz zo well-wazh"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "%d miz zo well-wazh"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "bloaz zo well-wazh"
 
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index df453314e6..778a1ebce3 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:05+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:17+0000\n"
 "Language-Team: Catalan\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: out-statusnet\n"
@@ -78,8 +78,13 @@ msgstr "Tancat"
 msgid "Save access settings"
 msgstr "Desa els parÃ metres del lloc"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Desa"
@@ -109,7 +114,7 @@ msgstr "No existeix la pÃ gina."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existeix aquest usuari."
@@ -347,7 +352,7 @@ msgstr "No s'ha trobat cap estatus amb aquesta ID."
 msgid "This status is already a favorite."
 msgstr "Aquest estat ja Ã©s un preferit."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "No es pot crear favorit."
 
@@ -467,7 +472,7 @@ msgstr "No s'ha trobat el grup."
 msgid "You are already a member of that group."
 msgstr "Ja sou membre del grup."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "L'administrador us ha blocat del grup."
 
@@ -519,17 +524,17 @@ msgid "Invalid token."
 msgstr "Mida invÃ lida."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -562,12 +567,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Enviament de formulari inesperat."
 
@@ -823,27 +831,44 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "No bloquis l'usuari"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "SÃ"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Bloquejar aquest usuari"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Error al guardar la informaciÃ³ del block."
 
@@ -856,8 +881,8 @@ msgstr "Error al guardar la informaciÃ³ del block."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "No s'ha trobat el grup."
 
@@ -917,16 +942,24 @@ msgstr "Tipus d'adreÃ§a desconeguda %s."
 msgid "That address has already been confirmed."
 msgstr "Aquesta adreÃ§a ja ha estat confirmada."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "No s'ha pogut actualitzar l'usuari."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "No s'ha pogut eliminar la confirmaciÃ³ de correu electrÃ²nic."
 
@@ -979,12 +1012,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "No es pot esborrar la notificaciÃ³."
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Elimina aquesta aplicaciÃ³"
 
@@ -1019,11 +1054,13 @@ msgstr "Eliminar nota."
 msgid "Are you sure you want to delete this notice?"
 msgstr "N'estÃ s segur que vols eliminar aquesta notificaciÃ³?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "No elimineu aquest avÃs"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Eliminar aquesta nota"
 
@@ -1045,7 +1082,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Suprimeix l'usuari"
 
@@ -1157,15 +1195,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Guardar"
 
@@ -1298,32 +1334,44 @@ msgstr "No s'han pogut crear els Ã lies."
 msgid "Options saved."
 msgstr "ConfiguraciÃ³ guardada."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "ConfiguraciÃ³ del correu electrÃ²nic"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestionar com reps correus de %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "AdreÃ§a"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "AdreÃ§a de correu electrÃ²nic"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "AdreÃ§a electrÃ²nica confirmada actualment."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Suprimeix"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1331,111 +1379,146 @@ msgstr ""
 "Esperant a confirmar aquesta direcciÃ³. Revisa la teva safata d'entrada (i la "
 "carpeta de spam!) per al missatge amb les instruccions."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "CancelÂ·la"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "AdreÃ§a de correu electrÃ²nic"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "AdreÃ§a electrÃ²nica, com ara Â«nomusuari@example.orgÂ»"
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Afegeix"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Correu electrÃ²nic entrant"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 "Envia correu electrÃ²nic a aquesta adreÃ§a per publicar noves notificacions."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Posar un nou correu electrÃ²nic per publicar; cancelÂ·lar l'antic."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Nou"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "PreferÃ¨ncies"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 "Envia'm notificacions quan algÃº nou se'm subscrigui, al meu correu "
 "electrÃ²nic."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Envia'm un correu electrÃ²nic quan algÃº afegeixi una nota meva com a favorit."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Envia'm un correu electrÃ²nic quan algÃº m'envii un missatge privat."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Envia'm un correu electrÃ²nic quan algÃº m'envii un missatge privat."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permetre que els amics em reclamin i m'enviÃ¯n un correu electrÃ²nic."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Vull publicar notificacions per correu electrÃ²nic."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publica una MicroID per al meu correu electrÃ²nic."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "S'han desat les preferÃ¨ncies."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "S'han desat les preferÃ¨ncies de disseny."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "No hi ha cap adreÃ§a electrÃ²nica."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "No es pot normalitzar l'adreÃ§a electrÃ²nica."
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "AdreÃ§a de correu electrÃ²nic no vÃ lida."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Ja Ã©s la vostra adreÃ§a electrÃ²nica."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "L'adreÃ§a electrÃ²nica ja pertany a un altre usuari."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "No s'ha pogut inserir el codi de confirmaciÃ³."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1444,43 +1527,56 @@ msgstr ""
 "Revisa la teva safata d'entrada (i la carpeta de spam!) per veure aquest "
 "codi i les instruccions per utilitzar-lo."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Cap confirmaciÃ³ pendent per a cancelÂ·lar."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Aquesta adreÃ§a de missatgeria instantÃ nia Ã©s incorrecta."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "ConfirmaciÃ³ cancelÂ·lada."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Aquest no Ã©s el teu correu electrÃ²nic"
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "L'adreÃ§a ha estat eliminada."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "No hi ha cap direcciÃ³ de correu electrÃ²nic entrant."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "No s'ha pogut actualitzar el registre de l'usuari."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Eliminat el correu electrÃ²nic entrant."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nou correu electrÃ²nic entrant afegit."
 
@@ -1670,15 +1766,17 @@ msgstr ""
 "Esteu segur que voleu blocar l'usuari Â«%sÂ» del grup Â«%sÂ»? Se suprimiran del "
 "grup, i no podran enviar-hi res ni subscriure-s'hi en el futur."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "No bloquis l'usuari del grup"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Bloca l'usuari del grup"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "S'ha produÃ¯t un error en la base de dades en blocar l'usuari del grup."
 
@@ -1851,11 +1949,15 @@ msgstr "L'usuari no estÃ  blocat del grup."
 msgid "Error removing the block."
 msgstr "S'ha produÃ¯t un error en suprimir el bloc."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "ParÃ metres de missatgeria instantÃ nia"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1864,15 +1966,24 @@ msgstr ""
 "Pots enviar i rebre avisos via [missatges instantanis](%%doc.im%%) de Jabber/"
 "GTalk. Configura la teva adreÃ§a i opcions a sota."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "La MI no Ã©s disponible."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "AdreÃ§a de missatgeria instantÃ nia"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "AdreÃ§a actual Jabber/Gtalk confirmada."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1882,11 +1993,9 @@ msgstr ""
 "Jabber/GTalk un missatge amb mÃ©s instruccions. (Has afegit a %s a la teva "
 "llista d'amics?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "AdreÃ§a de missatgeria instantÃ nia"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1896,45 +2005,67 @@ msgstr ""
 "assegura't d'afegir a %s a la teva llista d'amics en el teu client de "
 "missatgeria instantÃ nia o a GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "PreferÃ¨ncies"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envia'm avisos per Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Envia'm un avÃs quan el meu estat Jabber/GTalk canvii."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Envia'm respostes a travÃ©s de Jabber/GTalk de la gent a la que no estic "
 "subscrita."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publica una MicroID per a la meva direcciÃ³ de Jabber/GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "S'han desat les preferÃ¨ncies."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Cap Jabber ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossible normalitzar aquest Jabber ID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no vÃ lid"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Aquest ja Ã©s el teu Jabber ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Aquest Jabber ID ja estÃ  sent utilitzat per un altre usuari."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1943,10 +2074,35 @@ msgstr ""
 "S'ha enviat un codi de confirmaciÃ³ a l'adreÃ§a de missatgeria instantÃ nia que "
 "has afegit. Has d'acceptar que %s et pugui enviar missatges."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Aquesta adreÃ§a de missatgeria instantÃ nia Ã©s incorrecta."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "No s'ha pogut eliminar la confirmaciÃ³ de correu electrÃ²nic."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "ConfirmaciÃ³ cancelÂ·lada."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Aquest no Ã©s el teu Jabber ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "L'adreÃ§a ha estat eliminada."
+
 #: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1991,7 +2147,9 @@ msgstr "Invitar nous usuaris"
 msgid "You are already subscribed to these users:"
 msgstr "Ja estÃ s subscrit a aquests usuaris:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2115,7 +2273,9 @@ msgstr "Has d'haver entrat per participar en un grup."
 msgid "No nickname or ID."
 msgstr "Cap sobrenom o ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s s'ha unit al grup %2$s"
@@ -2124,11 +2284,13 @@ msgstr "%1$s s'ha unit al grup %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Has d'haver entrat per a poder marxar d'un grup."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "No ets membre d'aquest grup."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%s ha abandonat el grup %s"
@@ -2244,12 +2406,12 @@ msgstr "Utilitza aquest formulari per crear un nou grup."
 msgid "New message"
 msgstr "Nou missatge"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "No podeu enviar un misssatge a aquest usuari."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Cap contingut!"
 
@@ -2257,7 +2419,7 @@ msgstr "Cap contingut!"
 msgid "No recipient specified."
 msgstr "No has especificat el destinatari."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No t'enviÃ¯s missatges a tu mateix, simplement dir-te aixÃ²."
@@ -2518,7 +2680,7 @@ msgid "6 or more characters"
 msgstr "6 o mÃ©s carÃ cters"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -3899,46 +4061,76 @@ msgstr ""
 msgid "Save site notice"
 msgstr "AvÃs del lloc"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "ParÃ metres de l'SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Pots rebre missatges SMS a travÃ©s del teu coreu electrÃ²nic des de %%site.name"
 "%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "L'SMS no Ã©s disponible."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "AdreÃ§a de missatgeria instantÃ nia"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "NÃºmero de telÃ¨fon actualment confirmat i activat per SMS."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Esperant confirmaciÃ³ per aquest nÃºmero de telÃ¨fon."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Codi de confirmaciÃ³"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Escriu el codi que has rebut en el teu telÃ¨fon mÃ²bil."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "NÃºmero de telÃ¨fon per als SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "NÃºmero de telÃ¨fon, no puntuaciÃ³ ni espais, en l'Ã rea del codi"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "PreferÃ¨ncies"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3946,23 +4138,34 @@ msgstr ""
 "Enviar-me avisos a travÃ©s de SMS; puc entendre que aixÃ² repercutirÃ  en una "
 "exorbitant cÃ rrega del meu transport."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "S'han desat les preferÃ¨ncies."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "No hi ha cap nÃºmero de telÃ¨fon."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "No s'ha selÂ·leccionat cap transport."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Aquest ja Ã©s el teu nÃºmero de telÃ¨fon."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Aquest nÃºmero de telÃ¨fon pertany a un altre usuari."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -3972,23 +4175,42 @@ msgstr ""
 "la teva safata d'entrada (i la carpeta de spam!) per veure aquest codi i les "
 "instruccions per utilitzar-lo."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Aquest Ã©s un nÃºmero de confirmaciÃ³ incorrecte."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "ConfirmaciÃ³ cancelÂ·lada."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Aquest no Ã©s el teu nÃºmero de telÃ¨fon."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "NÃºmero de telÃ¨fon per als SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Transport mÃ²bil"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Selecciona un transport"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3998,7 +4220,8 @@ msgstr ""
 "accepti SMS a travÃ©s del correu electrÃ²nic, perÃ² no estÃ  a la llista, "
 "envia'ns un correu electrÃ²nic per fer-nos-ho saber %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "No hi ha cap codi entrat"
 
@@ -5225,10 +5448,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "CancelÂ·la"
 
@@ -5304,34 +5525,40 @@ msgstr "Comanda fallida"
 msgid "Notice with that id does not exist"
 msgstr "No hi ha cap perfil amb aquesta id."
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "L'usuari no tÃ© Ãºltima nota"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "No es pot actualitzar l'usuari amb el correu electrÃ²nic confirmat"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "No es pot actualitzar l'usuari amb el correu electrÃ²nic confirmat"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Perdona, aquesta comanda no estÃ  implementada."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "ReclamaciÃ³ enviada"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5339,202 +5566,206 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Nota marcada com a favorita."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Ja sou membre del grup."
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "No s'ha pogut afegir l'usuari %s al grup %s."
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s s'ha pogut afegir al grup %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "No s'ha pogut eliminar l'usuari %s del grup %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s ha abandonat el grup %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nom complet: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "LocalitzaciÃ³: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "PÃ gina web: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Sobre tu: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr "Missatge massa llarg - mÃ xim Ã©s 140 carÃ cters, tu has enviat %d"
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Missatge directe per a %s enviat"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Error al enviar el missatge directe."
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "No es poden posar en on les notificacions."
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "Eliminar aquesta nota"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "NotificaciÃ³ publicada"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "Problema en guardar l'avÃs."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Missatge massa llarg - mÃ xim Ã©s 140 carÃ cters, tu has enviat %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "S'ha enviat la resposta a %s"
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Problema en guardar l'avÃs."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especifica el nom de l'usuari a que vols subscriure't"
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "No estÃ s subscrit a aquest perfil."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Subscrit a %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especifica el nom de l'usuari del que vols deixar d'estar subscrit"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Has deixat d'estar subscrit a %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Comanda encara no implementada."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Notificacions off."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "No es poden posar en off les notificacions."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Notificacions on."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "No es poden posar en on les notificacions."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "Has deixat d'estar subscrit a %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "No estÃ s subscrit a aquest perfil."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ja estÃ s subscrit a aquests usuaris:"
 msgstr[1] "Ja estÃ s subscrit a aquests usuaris:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "No pots subscriure a un altre a tu mateix."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "No pots subscriure a un altre a tu mateix."
 msgstr[1] "No pots subscriure a un altre a tu mateix."
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "No sou membre de cap grup."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sou un membre d'aquest grup:"
 msgstr[1] "Sou un membre d'aquests grups:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6383,6 +6614,10 @@ msgstr "No argument de la id."
 msgid "Repeat this notice?"
 msgstr "Repeteix l'avÃs"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "SÃ"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repeteix l'avÃs"
@@ -6575,47 +6810,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Modera"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "fa pocs segons"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "fa un minut"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fa %d minuts"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "fa una hora"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "fa %d hores"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "fa un dia"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "fa %d dies"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "fa un mes"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "fa %d mesos"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "fa un any"
 
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 8539429fde..ff11613736 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:21+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:20+0000\n"
 "Language-Team: Czech\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: out-statusnet\n"
@@ -78,8 +78,13 @@ msgstr "Å½Ã¡dnÃ½ takovÃ½ uÅ¾ivatel."
 msgid "Save access settings"
 msgstr "NastavenÃ"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -111,7 +116,7 @@ msgstr "Å½Ã¡dnÃ© takovÃ© oznÃ¡menÃ."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Å½Ã¡dnÃ½ takovÃ½ uÅ¾ivatel."
@@ -347,7 +352,7 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr "Toto je jiÅ¾ vaÅ¡e Jabber"
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr ""
 
@@ -469,7 +474,7 @@ msgstr "Å½Ã¡dnÃ½ poÅ¾adavek nebyl nalezen!"
 msgid "You are already a member of that group."
 msgstr "JiÅ¾ jste pÅihlÃ¡Å¡en"
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -522,17 +527,17 @@ msgid "Invalid token."
 msgstr "NeplatnÃ¡ velikost"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -566,12 +571,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "NeÄekanÃ¡ forma submission."
 
@@ -836,28 +844,45 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Ne"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 #, fuzzy
 msgid "Do not block this user"
 msgstr "Å½Ã¡dnÃ½ takovÃ½ uÅ¾ivatel."
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ano"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Zablokovat tohoto uÅ¾ivatele"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr ""
 
@@ -870,8 +895,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 #, fuzzy
 msgid "No such group."
 msgstr "Å½Ã¡dnÃ© takovÃ© oznÃ¡menÃ."
@@ -933,16 +958,24 @@ msgstr "NeznÃ¡mÃ½ typ adresy %s"
 msgid "That address has already been confirmed."
 msgstr "Adresa jiÅ¾ byla potvrzena"
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Nelze aktualizovat uÅ¾ivatele"
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Nelze smazat potvrzenÃ emailu"
 
@@ -1000,12 +1033,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "Å½Ã¡dnÃ© takovÃ© oznÃ¡menÃ."
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "Odstranit toto oznÃ¡menÃ"
@@ -1039,12 +1074,14 @@ msgstr ""
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "Å½Ã¡dnÃ© takovÃ© oznÃ¡menÃ."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Odstranit toto oznÃ¡menÃ"
 
@@ -1068,7 +1105,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Odstranit tohoto uÅ¾ivatele"
 
@@ -1185,15 +1223,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "UloÅ¾it"
 
@@ -1329,180 +1365,240 @@ msgstr "Nelze uloÅ¾in informace o obrÃ¡zku"
 msgid "Options saved."
 msgstr "NastavenÃ uloÅ¾eno."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "NastavenÃ E-mailu"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresa"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "PotvrzenÃ emailovÃ© adresy"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr ""
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Odstranit"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ZruÅ¡it"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "PotvrzenÃ emailovÃ© adresy"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "PÅidat"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "NovÃ½"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "NastavenÃ"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr ""
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "NastavenÃ uloÅ¾eno"
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr ""
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "NenÃ platnou mailovou adresou."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr ""
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr ""
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Nelze vloÅ¾it potvrzujÃcÃ kÃ³d"
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "NeÄekÃ¡ Å¾Ã¡dnÃ© potvrzenÃ na zruÅ¡enÃ."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Toto je Å¡patnÃ¡ IM adresa"
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "PotvrÄ zruÅ¡enÃ"
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr ""
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Adresa byla odstranÄna"
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr ""
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr ""
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1702,17 +1798,19 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 #, fuzzy
 msgid "Do not block this user from this group"
 msgstr "Nelze pÅesmÄrovat na server: %s"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 #, fuzzy
 msgid "Block this user from this group"
 msgstr "Å½Ã¡dnÃ½ takovÃ½ uÅ¾ivatel."
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1892,12 +1990,16 @@ msgstr "UÅ¾ivatel nemÃ¡ profil."
 msgid "Error removing the block."
 msgstr "Chyba pÅi uklÃ¡danÃ uÅ¾ivatele"
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "IM nastavenÃ"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1906,16 +2008,26 @@ msgstr ""
 "MÅ¯Å¾ete odesÃlat nebo pÅijÃ¡mat sdÄlenÃ pomocÃ Jabber/GTalk [zprÃ¡v](%%doc.im%"
 "%).Zadejte svou adresu nÃÅ¾e."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 #, fuzzy
 msgid "IM is not available."
 msgstr "Tato strÃ¡nka nenÃ k dispozici v typu mÃ©dia kterÃ¡ pÅijÃmÃ¡te."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "IM adresa"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "PotvrzenÃ© Jabber/GTalk adresy"
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1924,12 +2036,9 @@ msgstr ""
 "ÄakÃ¡m na potvrzenÃ tÃ©to adresy. Zkontrolujte zprÃ¡vy na vaÅ¡em Jabber/GTalk "
 "ÃºÄtu. (PÅidal jste si %s do vaÅ¡ich kontaktÅ¯?)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "IM adresa"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1938,43 +2047,65 @@ msgstr ""
 "Jabber nebo GTalk adresy, napÅÃklad \"jmeno@example.org\". Neprve se "
 "ujistÄte Å¾e jste pÅidal %s do vaÅ¡eho seznamu kontaktÅ¯."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "NastavenÃ"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "ZasÃlat oznÃ¡menÃ pomocÃ Jabber/GTalk"
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Poslat oznÃ¡menÃ, kdyÅ¾ se zmÄnÃ mÅ¯j Jabber/Gtalk status."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "NastavenÃ uloÅ¾eno"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Å½Ã¡dnÃ© Jabber ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nelze normalizovat JabberID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "NenÃ platnÃ½m Jabber ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Toto je jiÅ¾ vaÅ¡e Jabber"
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID jiÅ¾ patÅÃ jinÃ©mu uÅ¾ivateli"
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1983,10 +2114,35 @@ msgstr ""
 "OvÄÅujÃcÃ kÃ³d byl poslÃ¡n na vloÅ¾enou IM adresu. MusÃte prokÃ¡zat %s pro "
 "posÃlÃ¡nÃ zprÃ¡v."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Toto je Å¡patnÃ¡ IM adresa"
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Nelze smazat potvrzenÃ emailu"
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "PotvrÄ zruÅ¡enÃ"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Toto nenÃ vÃ¡Å¡ Jabber"
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Adresa byla odstranÄna"
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2027,7 +2183,9 @@ msgstr ""
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2122,7 +2280,9 @@ msgstr ""
 msgid "No nickname or ID."
 msgstr "Å½Ã¡dnÃ¡ pÅezdÃvka."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
@@ -2131,12 +2291,14 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "Neodeslal jste nÃ¡m profil"
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1 statusÅ¯ na %2"
@@ -2248,12 +2410,12 @@ msgstr ""
 msgid "New message"
 msgstr ""
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr ""
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Å½Ã¡dnÃ½ obsah!"
 
@@ -2261,7 +2423,7 @@ msgstr "Å½Ã¡dnÃ½ obsah!"
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2522,7 +2684,7 @@ msgid "6 or more characters"
 msgstr "6 a vÃce znakÅ¯"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Heslo znovu"
 
@@ -3877,99 +4039,160 @@ msgstr ""
 msgid "Save site notice"
 msgstr "NovÃ© sdÄlenÃ"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "IM nastavenÃ"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Tato strÃ¡nka nenÃ k dispozici v typu mÃ©dia kterÃ¡ pÅijÃmÃ¡te."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM adresa"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr ""
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Heslo znovu"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 #, fuzzy
 msgid "SMS phone number"
 msgstr "Å½Ã¡dnÃ© telefonnÃ ÄÃslo."
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "NastavenÃ"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "NastavenÃ uloÅ¾eno"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Å½Ã¡dnÃ© telefonnÃ ÄÃslo."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr ""
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr "Tento potvrzujÃcÃ kÃ³d vÃ¡m nepatÅÃ!"
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "PotvrÄ zruÅ¡enÃ"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr ""
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Å½Ã¡dnÃ© telefonnÃ ÄÃslo."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr ""
 
@@ -5198,10 +5421,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "ZruÅ¡it"
 
@@ -5278,35 +5499,41 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "VzdÃ¡lenÃ½ profil s nesouhlasÃcÃm profilem"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 #, fuzzy
 msgid "User has no last notice"
 msgstr "UÅ¾ivatel nemÃ¡ profil."
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Nelze aktualizovat uÅ¾ivatele"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Nelze aktualizovat uÅ¾ivatele"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "OdpovÄdi na %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5314,207 +5541,211 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "JiÅ¾ jste pÅihlÃ¡Å¡en"
 
-#: lib/command.php:331
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
 msgstr "Nelze pÅesmÄrovat na server: %s"
 
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
 #, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%1 statusÅ¯ na %2"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
 msgstr "Nelze vytvoÅit OpenID z: %s"
 
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "%1 statusÅ¯ na %2"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, fuzzy, php-format
 msgid "Fullname: %s"
 msgstr "CelÃ© jmÃ©no"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "NemÅ¯Å¾ete se registrovat, pokud nesouhlasÃte s licencÃ."
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "Odstranit toto oznÃ¡menÃ"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "SdÄlenÃ"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "ProblÃ©m pÅi uklÃ¡dÃ¡nÃ sdÄlenÃ"
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "OdpovÄdi na %s"
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "ProblÃ©m pÅi uklÃ¡dÃ¡nÃ sdÄlenÃ"
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Neodeslal jste nÃ¡m profil"
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "OdhlÃ¡sit"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Neodeslal jste nÃ¡m profil"
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Neodeslal jste nÃ¡m profil"
 msgstr[1] "Neodeslal jste nÃ¡m profil"
 msgstr[2] ""
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "VzdÃ¡lenÃ½ odbÄr"
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "VzdÃ¡lenÃ½ odbÄr"
 msgstr[1] "VzdÃ¡lenÃ½ odbÄr"
 msgstr[2] ""
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Neodeslal jste nÃ¡m profil"
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Neodeslal jste nÃ¡m profil"
 msgstr[1] "Neodeslal jste nÃ¡m profil"
 msgstr[2] ""
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6369,6 +6600,10 @@ msgstr "Å½Ã¡dnÃ½ takovÃ½ dokument."
 msgid "Repeat this notice?"
 msgstr "Odstranit toto oznÃ¡menÃ"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ano"
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6565,47 +6800,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "pÅed pÃ¡r sekundami"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "asi pÅed minutou"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "asi pÅed %d minutami"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "asi pÅed hodinou"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "asi pÅed %d hodinami"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "asi pÅede dnem"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "pÅed %d dny"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "asi pÅed mÄsÃcem"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "asi pÅed %d mesÃci"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "asi pÅed rokem"
 
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index b47c8be78e..56db81a7f3 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -15,12 +15,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:26+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:24+0000\n"
 "Language-Team: German\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: out-statusnet\n"
@@ -79,8 +79,13 @@ msgstr "Geschlossen"
 msgid "Save access settings"
 msgstr "Zugangs-Einstellungen speichern"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Speichern"
@@ -111,7 +116,7 @@ msgstr "Seite nicht vorhanden"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
@@ -355,7 +360,7 @@ msgstr "Keine Nachricht mit dieser ID gefunden."
 msgid "This status is already a favorite."
 msgstr "Diese Nachricht ist bereits ein Favorit!"
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Konnte keinen Favoriten erstellen."
 
@@ -475,7 +480,7 @@ msgstr "Gruppe nicht gefunden!"
 msgid "You are already a member of that group."
 msgstr "Du bist bereits Mitglied dieser Gruppe"
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "Der Admin dieser Gruppe hat dich gesperrt."
 
@@ -526,17 +531,17 @@ msgid "Invalid token."
 msgstr "UngÃ¼ltiges Token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -569,12 +574,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "Die Anfrage %s wurde gesperrt und widerrufen."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Unerwartete Formulareingabe."
 
@@ -837,27 +845,44 @@ msgstr ""
 "Benutzer wird gelÃ¶scht, dieser kann dich in Zukunft nicht mehr abonnieren "
 "und bekommt keine @-Antworten."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Nein"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Diesen Benutzer freigeben"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Diesen Benutzer blockieren"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Konnte Blockierungsdaten nicht speichern."
 
@@ -870,8 +895,8 @@ msgstr "Konnte Blockierungsdaten nicht speichern."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Keine derartige Gruppe."
 
@@ -930,16 +955,24 @@ msgstr "Nicht erkannter Adresstyp %s"
 msgid "That address has already been confirmed."
 msgstr "Diese Adresse wurde bereits bestÃ¤tigt."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Konnte Benutzerdaten nicht aktualisieren."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Konnte E-Mail-BestÃ¤tigung nicht lÃ¶schen."
 
@@ -993,11 +1026,13 @@ msgstr ""
 "Bist du sicher, dass du dieses Programm lÃ¶schen willst? Es werden alle Daten "
 "aus der Datenbank entfernt, auch alle bestehenden Benutzer-Verbindungen."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Dieses Programm nicht lÃ¶schen"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Programm lÃ¶schen"
 
@@ -1032,11 +1067,13 @@ msgstr "Notiz lÃ¶schen"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Bist du sicher, dass du diese Nachricht lÃ¶schen mÃ¶chtest?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Diese Nachricht nicht lÃ¶schen"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Nachricht lÃ¶schen"
 
@@ -1060,7 +1097,8 @@ msgstr ""
 "Bist du sicher, dass du den Benutzer lÃ¶schen wisst? Alle Daten des Benutzers "
 "werden aus der Datenbank gelÃ¶scht (ohne ein Backup)."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Diesen Benutzer lÃ¶schen"
 
@@ -1173,15 +1211,13 @@ msgid "Reset back to default"
 msgstr "Standard wiederherstellen"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Speichern"
 
@@ -1308,31 +1344,43 @@ msgstr "Konnte keinen Favoriten erstellen."
 msgid "Options saved."
 msgstr "Einstellungen gespeichert."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "E-Mail-Einstellungen"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Einstellen, wie und wann du E-Mails von %%site.name%% bekommst."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresse"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-Mail-Adresse"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Aktuelle bestÃ¤tigte E-Mail-Adresse."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Entfernen"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1340,110 +1388,145 @@ msgstr ""
 "Warte auf die BestÃ¤tigung dieser Adresse. PrÃ¼fe Deinen Nachrichteneingang "
 "(auch den Spam-Ordner) auf eine Nachricht mit weiteren Instruktionen."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-Mail-Adresse"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-Mail-Adresse, beispielsweise âBenutzername@example.orgâ"
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "HinzufÃ¼gen"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Eingehende E-Mail"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Schicke ein E-Mail an diese Adresse um eine Nachricht zu posten."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Neue E-Mail-Adresse fÃ¼r Postings aktivieren; die alte wird automatisch "
 "deaktiviert."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Neu"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Einstellungen"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Informiere mich Ã¼ber neues Abonnements per E-Mail."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Mir eine E-Mail schicken, wenn jemand meine Nachricht als Favorit speichert."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Mir eine E-Mail schicken, wenn mir jemand eine private Nachricht schickt."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Schick mir eine E-Mail, wenn mir jemand eine @Nachricht schickt."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Erlaube Freunden mich zu stupsen und mir E-Mails zu senden."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Ich mÃ¶chte EintrÃ¤ge per E-Mail verÃ¶ffentlichen."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "MicroID fÃ¼r meine E-Mail-Adresse verÃ¶ffentlichen."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Einstellungen gesichert."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Design-Einstellungen gespeichert."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Keine E-Mail-Adresse."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Konnte diese E-Mail-Adresse nicht normalisieren"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "UngÃ¼ltige E-Mail-Adresse."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Dies ist bereits deine E-Mail-Adresse."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Diese E-Mail-Adresse gehÃ¶rt einem anderen Nutzer."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Konnte keinen BestÃ¤tigungscode einfÃ¼gen."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1452,43 +1535,56 @@ msgstr ""
 "ÃberprÃ¼fe deinen Posteingang (auch den Spamordner!) fÃ¼r den Code und "
 "Anweisungen, wie dieser benutzt wird."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Keine ausstehende BestÃ¤tigung, die abgebrochen werden kann."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Das ist die falsche IM-Adresse."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "BestÃ¤tigung abgebrochen."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Dies ist nicht deine E-Mail-Adresse."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Die Adresse wurde entfernt."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Keine Eingangs-E-Mail-Adresse."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Konnte Nutzereintrag nicht schreiben"
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Eingehende E-Mail-Adresse entfernt"
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Neue Eingangs-E-Mail-Adresse hinzugefÃ¼gt."
 
@@ -1681,15 +1777,17 @@ msgstr ""
 "abschicken und wird auch in Zukunft dieser Gruppe nicht mehr beitreten "
 "kÃ¶nnen."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Diesen Benutzerzugang nicht fÃ¼r diese Gruppe blockieren."
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Diesen Nutzer von der Gruppe sperren"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "Datenbank Fehler beim Versuch den Nutzer aus der Gruppe zu blockieren."
 
@@ -1873,11 +1971,15 @@ msgstr "Dieser Nutzer ist nicht von der Gruppe gesperrt."
 msgid "Error removing the block."
 msgstr "Fehler beim Freigeben des Benutzers."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "IM-Einstellungen"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1886,15 +1988,24 @@ msgstr ""
 "Du kannst Nachrichten mittels [Jabber/GTalk IM](%%doc.im%%) empfangen und "
 "senden. Stelle deine Adresse und Einstellungen unten ein."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "IM ist nicht verfÃ¼gbar."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM-Adresse"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktuelle bestÃ¤tigte Jabber/GTalk-Adresse"
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1904,11 +2015,9 @@ msgstr ""
 "sollte in deinem Jabber/GTalk-Konto eingehen. (Hast du %s zu deiner "
 "Freundesliste hinzugefÃ¼gt?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM-Adresse"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1918,45 +2027,67 @@ msgstr ""
 "Aber versichere dich zuerst, dass du %s in deine Kontaktliste in deinem IM-"
 "Programm oder GTalk aufgenommen hast."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Einstellungen"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Schicke mir Nachrichten mittels Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Schicke eine Nachricht, wenn sich mein Jabber/GTalk-Status verÃ¤ndert."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Schicke mir Antworten von Leuten, die ich nicht abonniert habe, mit Jabber/"
 "GTalk."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "MicroID fÃ¼r meine Jabber/GTalk-Adresse verÃ¶ffentlichen."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Einstellungen gesichert."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Keine Jabber-ID"
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Konnte diese Jabber ID nicht normalisieren"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "UngÃ¼ltige Jabber-ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Diese JabberID hast du schon angegeben."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Diese Jabber ID wird bereits von einem anderen Benutzer verwendet."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1965,10 +2096,35 @@ msgstr ""
 "Ein BestÃ¤tigungscode wurde an die IM-Adresse geschickt, die du hinzugefÃ¼gt "
 "hast. Du musst zulassen, dass %s dir Nachrichten schicken darf."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Das ist die falsche IM-Adresse."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Konnte E-Mail-BestÃ¤tigung nicht lÃ¶schen."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "BestÃ¤tigung abgebrochen."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Dies ist nicht deine JabberID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Die Adresse wurde entfernt."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2011,7 +2167,9 @@ msgstr "Lade neue Leute ein"
 msgid "You are already subscribed to these users:"
 msgstr "Du hast diese Benutzer bereits abonniert:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2138,7 +2296,9 @@ msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
 msgid "No nickname or ID."
 msgstr "Kein Benutzername oder ID"
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ist der Gruppe %2$s beigetreten"
@@ -2147,11 +2307,13 @@ msgstr "%1$s ist der Gruppe %2$s beigetreten"
 msgid "You must be logged in to leave a group."
 msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s hat die Gruppe %2$s verlassen"
@@ -2262,12 +2424,12 @@ msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen."
 msgid "New message"
 msgstr "Neue Nachricht"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Kein Inhalt!"
 
@@ -2275,7 +2437,7 @@ msgstr "Kein Inhalt!"
 msgid "No recipient specified."
 msgstr "Kein EmpfÃ¤nger angegeben."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2539,7 +2701,7 @@ msgid "6 or more characters"
 msgstr "6 oder mehr Zeichen"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "BestÃ¤tigen"
 
@@ -3943,44 +4105,74 @@ msgstr "Systembenachrichtigung (max. 255 Zeichen; HTML erlaubt)"
 msgid "Save site notice"
 msgstr "Systemnachricht speichern"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "SMS-Einstellungen"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kannst SMS per E-Mail empfangen von %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "SMS ist nicht verfÃ¼gbar."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM-Adresse"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Aktuelle fÃ¼r den SMS-Dienst bestÃ¤tigte Telefonnummer."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Warte auf die BestÃ¤tigung dieser Telefonnummer."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "BestÃ¤tigungscode"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Gib den Code ein, den du auf deinem Handy via SMS bekommen hast."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "BestÃ¤tigen"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "SMS-Telefonnummer"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Einstellungen"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3988,23 +4180,34 @@ msgstr ""
 "Schicke mir Nachrichten per SMS; ich weiss, dass mir dadurch hohe Kosten bei "
 "meinem Netzbetreiber entstehen kÃ¶nnen."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Einstellungen gesichert."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Keine Telefonnummer."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Kein Netzanbieter ausgewÃ¤hlt."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Dies ist bereits deine Telefonnummer."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Diese Telefonnummer wird bereits von einem anderen Benutzer verwendet."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -4013,23 +4216,42 @@ msgstr ""
 "gesandt. ÃberprÃ¼fen Sie bitte Ihren Posteingang (auch den Spamordner!) auf "
 "den Code und die Anweisungen, um ihn zu benutzen."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Die BestÃ¤tigungsnummer ist falsch."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "BestÃ¤tigung abgebrochen."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Dies ist nicht deine Telefonnummer."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS-Telefonnummer"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Netzanbieter"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "WÃ¤hle einen Netzanbieter"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4039,7 +4261,8 @@ msgstr ""
 "Email beherrscht, aber noch in der Liste fehlt, schicke uns eine Mail unter %"
 "s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Kein Code eingegeben"
 
@@ -5242,10 +5465,8 @@ msgstr ""
 "Standardeinstellung dieses Programms: SchreibgeschÃ¼tzt oder Lese/"
 "Schreibzugriff"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -5321,34 +5542,40 @@ msgstr "Befehl fehlgeschlagen"
 msgid "Notice with that id does not exist"
 msgstr "Nachricht mit dieser ID existiert nicht"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "Benutzer hat keine letzte Nachricht"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Die bestÃ¤tigte E-Mail-Adresse konnte nicht gespeichert werden."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Konnte keinen lokalen Nutzer mit dem Nick %s finden"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Leider ist dieser Befehl noch nicht implementiert."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Es macht keinen Sinn dich selbst anzustupsen!"
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Stups an %s geschickt"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5359,57 +5586,55 @@ msgstr ""
 "Abonnenten: %2$s\n"
 "Mitteilungen: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Nachricht als Favorit markiert."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Du bist bereits Mitglied dieser Gruppe"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufÃ¼gen"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s ist der Gruppe %s beigetreten"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufÃ¼gen."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "Konnte Benutzer %s aus der Gruppe %s nicht entfernen"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s hat die Gruppe %s verlassen"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "VollstÃ¤ndiger Name: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Standort: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Ãber: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5418,138 +5643,145 @@ msgstr ""
 "%s ist ein entferntes Profil; man kann direkte Nachrichten nur an Nutzer auf "
 "dem selben Server senden."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Nachricht zu lang - maximal %d Zeichen erlaubt, du hast %d gesendet"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr ""
+"Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Direkte Nachricht an %s abgeschickt"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Fehler beim Senden der Nachricht"
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "Nachricht bereits wiederholt"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Nachricht von %s wiederholt"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Fehler beim Wiederholen der Nachricht"
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Nachricht zu lange - maximal %d Zeichen erlaubt, du hast %d gesendet"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Antwort an %s gesendet"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Problem beim Speichern der Nachricht."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Gib den Namen des Benutzers an, den du abonnieren mÃ¶chtest"
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "OMB Profile kÃ¶nnen nicht mit einem Kommando abonniert werden."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "%s abonniert"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren mÃ¶chtest"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "%s nicht mehr abonniert"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Befehl noch nicht implementiert."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Benachrichtigung deaktiviert."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "Konnte Benachrichtigung nicht deaktivieren."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Benachrichtigung aktiviert."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Konnte Benachrichtigung nicht aktivieren."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "Anmeldung ist abgeschaltet"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr "Der Link ist nur einmal benutzbar und fÃ¼r eine Dauer von 2 Minuten: %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "%s nicht mehr abonniert"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "Du hast niemanden abonniert."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du hast diese Benutzer bereits abonniert:"
 msgstr[1] "Du hast diese Benutzer bereits abonniert:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "Niemand hat Dich abonniert."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren."
 msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren."
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "Du bist in keiner Gruppe Mitglied."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du bist Mitglied dieser Gruppe:"
 msgstr[1] "Du bist Mitglied dieser Gruppen:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6493,6 +6725,10 @@ msgstr "Kein id Argument."
 msgid "Repeat this notice?"
 msgstr "Diese Nachricht wiederholen?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ja"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Diese Nachricht wiederholen"
@@ -6679,47 +6915,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "vor %d Minuten"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "vor %d Stunden"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "vor %d Tagen"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "vor %d Monaten"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "vor einem Jahr"
 
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 17a78c4566..e449fbac9c 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:29+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:27+0000\n"
 "Language-Team: Greek\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: el\n"
 "X-Message-Group: out-statusnet\n"
@@ -74,8 +74,13 @@ msgstr "ÎÎ»ÎµÎ¹ÏÏÏ"
 msgid "Save access settings"
 msgstr "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÏÎ¸Î¼Î¯ÏÎµÏÎ½ ÏÏÏÏÎ²Î±ÏÎ·Ï"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ÎÏÎ¿Î¸Î®ÎºÎµÏÏÎ·"
@@ -106,7 +111,7 @@ msgstr "ÎÎµÎ½ ÏÏÎ¬ÏÏÎµÎ¹ ÏÎÏÎ¿Î¹Î± ÏÎµÎ»Î¯Î´Î±"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ÎÎ±Î½ÎÎ½Î±Ï ÏÎÏÎ¿Î¹Î¿Ï ÏÏÎ®ÏÏÎ·Ï."
@@ -343,7 +348,7 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr ""
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr ""
 
@@ -465,7 +470,7 @@ msgstr "Î Î¿Î¼Î¬Î´Î± Î´ÎµÎ½ Î²ÏÎÎ¸Î·ÎºÎµ!"
 msgid "You are already a member of that group."
 msgstr ""
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -517,17 +522,17 @@ msgid "Invalid token."
 msgstr "ÎÎ®Î½ÏÎ¼Î±"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -560,12 +565,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -821,28 +829,45 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "ÎÏÎ¹"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 #, fuzzy
 msgid "Do not block this user"
 msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î´Î¹Î±Î³ÏÎ±ÏÎ®Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï."
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "ÎÎ±Î¹"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr ""
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr ""
 
@@ -855,8 +880,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 #, fuzzy
 msgid "No such group."
 msgstr "ÎÎ´ÏÎ½Î±ÏÎ· Î· Î±ÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÎ¿Ï ÏÏÎ¿ÏÎ¯Î»."
@@ -916,16 +941,24 @@ msgstr ""
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ÎÏÎÏÏÏÎµ Î· ÎµÎ½Î·Î¼ÎÏÏÏÎ· ÏÎ¿Ï ÏÏÎ®ÏÏÎ·."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÎÏÎÏÏÏÎµ Î· Î´Î¹Î±Î³ÏÎ±ÏÎ® email ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï."
 
@@ -982,12 +1015,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î´Î¹Î±Î³ÏÎ±ÏÎ®Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï."
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "Î ÎµÏÎ¹Î³ÏÎ¬ÏÏÎµ ÏÎ·Î½ Î¿Î¼Î¬Î´Î± Î® ÏÎ¿ Î¸ÎÎ¼Î±"
@@ -1022,12 +1057,14 @@ msgstr "ÎÎ¹Î±Î³ÏÎ±ÏÎ® Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï"
 msgid "Are you sure you want to delete this notice?"
 msgstr "ÎÎ¯ÏÎ±Î¹ ÏÎ¯Î³Î¿ÏÏÎ¿Ï ÏÏÎ¹ Î¸ÎµÏ Î½Î± Î´Î¹Î±Î³ÏÎ¬ÏÎµÎ¹Ï Î±ÏÏÏ ÏÎ¿ Î¼Î®Î½ÏÎ¼Î±;"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î´Î¹Î±Î³ÏÎ±ÏÎ®Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr ""
 
@@ -1050,7 +1087,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "ÎÎ¹Î±Î³ÏÎ¬ÏÏÎµ Î±ÏÏÏÎ½ ÏÎ¿Î½ ÏÏÎ®ÏÏÎ·"
 
@@ -1164,15 +1202,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
 
@@ -1308,32 +1344,44 @@ msgstr "ÎÎ´ÏÎ½Î±ÏÎ· Î· Î±ÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÎ¿Ï ÏÏÎ¿ÏÎ¯Î»."
 msgid "Options saved."
 msgstr ""
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï Email"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ·"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎµÎ¹Ï email"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Î¤ÏÎÏÎ¿ÏÏÎ± ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¼ÎÎ½Î· email Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 #, fuzzy
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
@@ -1342,107 +1390,140 @@ msgstr ""
 "ÎÎ½Î±Î¼ÎÎ½ÏÎ½ÏÎ±Ï ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· ÏÎµ Î±ÏÏÎ® ÏÎ· Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·. ÎÎ»ÎµÎ³Î¾Îµ ÏÎ¿ mail ÏÎ¿Ï (ÎºÎ±Î¹ ÏÎ¿ "
 "ÏÎ¬ÎºÎµÎ»Î¿ spam!) Î³Î¹Î± Î¼Î®Î½ÏÎ¼Î± Î¼Îµ ÏÎµÏÎ±Î¹ÏÎÏÏ Î¿Î´Î·Î³Î¯ÎµÏ. "
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ÎÎºÏÏÏÏÎ·"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎµÎ¹Ï email"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· email, Ï.Ï: \"UserName@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Î ÏÎ¿ÏÎ¸Î®ÎºÎ·"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ÎÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î¿ email"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Î ÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "ÎÎÎ»Ï Î½Î± Î´Î·Î¼Î¿ÏÎ¹ÎµÏÏ ÎµÎ½Î·Î¼ÎµÏÏÏÎµÎ¹Ï Î¼ÎÏÏ email"
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "ÎÎ¹ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎ±Î½"
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr ""
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎºÎ±Î½Î¿Î½Î¹ÎºÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï Î±ÏÏÎ®Ï ÏÎ·Ï email Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·Ï"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr ""
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr ""
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr ""
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÎÏÎÏÏÏÎµ Î· ÎµÎ¹ÏÎ±Î³ÏÎ³Î® ÎºÏÎ´Î¹ÎºÎ¿Ï ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1451,43 +1532,56 @@ msgstr ""
 "ÏÏÎ¿ÏÎ¸ÎÏÎ±ÏÎµ. ÎÎ»ÎÎ³Î¾ÏÎµ ÏÎ± ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î± (ÎºÎ±Î¹ ÏÎ¿Î½ ÏÎ¬ÎºÎµÎ»Î¿ Î±Î½ÎµÏÎ¹Î¸ÏÎ¼Î·ÏÎ·Ï "
 "Î±Î»Î»Î·Î»Î¿Î³ÏÎ±ÏÎ¯Î±Ï) Î³Î¹Î± ÏÎ¿Î½ ÎºÏÎ´Î¹ÎºÏ ÎºÎ±Î¹ Î³Î¹Î± ÏÎ¿ ÏÏÏ Î½Î± ÏÎ¿Î½ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
-msgstr ""
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
+msgstr "ÎÎ¹ÏÎ¬Î³ÎµÏÎµ ÏÎµÏÎ´ÏÎ½ÏÎ¼Î¿ Î® Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· email."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Î ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î±ÎºÏÏÏÎ¸Î·ÎºÎµ."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr ""
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
-msgstr ""
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
+msgstr "Î Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· ÏÎ¿Ï ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î¿Ï email Î±ÏÎ±Î¹ÏÎÎ¸Î·ÎºÎµ."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr ""
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÎÏÎÏÏÏÎµ Î· ÎµÎ½Î·Î¼ÎÏÏÏÎ· ÎµÎ³Î³ÏÎ±ÏÎ®Ï ÏÎ¿Ï ÏÏÎ®ÏÏÎ·."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Î Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· ÏÎ¿Ï ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î¿Ï email Î±ÏÎ±Î¹ÏÎÎ¸Î·ÎºÎµ."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1677,15 +1771,17 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr ""
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr ""
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1858,28 +1954,42 @@ msgstr ""
 msgid "Error removing the block."
 msgstr ""
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÎÎ"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 #, fuzzy
 msgid "IM is not available."
 msgstr "Î Î±ÏÏÎ¹ÎºÎ® ÏÎµÎ»Î¯Î´Î± Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏÏÎ¿ URL."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· ÎÎ"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Î¤ÏÎÏÎ¿ÏÏÎ± ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¼ÎÎ½Î· Jabber/GTalk Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, fuzzy, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1889,55 +1999,74 @@ msgstr ""
 "Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Ï ÏÎ¿Ï Î³Î¹Î± Î¼Î®Î½ÏÎ¼Î± Î¼Îµ ÏÎµÏÎ±Î¹ÏÎÏÏ Î¿Î´Î·Î³Î¯ÎµÏ. (Î ÏÏÏÎ¸ÎµÏÎµÏ ÏÎ¿ ÏÏÎ®ÏÏÎ· %s ÏÏÎ· "
 "Î»Î¯ÏÏÎ± ÏÎ¯Î»ÏÎ½?)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· ÎÎ"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Î ÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "ÎÎ¹ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎ±Î½"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr ""
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± ÎºÎ±Î½Î¿Î½Î¹ÎºÎ¿ÏÎ¿Î¯Î·ÏÎ·Ï ÏÎ¿Ï Jabber ID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr ""
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1946,10 +2075,35 @@ msgstr ""
 "ÎÏÎµÎ¹ Î±ÏÎ¿ÏÏÎ±Î»ÎµÎ¯ ÎÎ½Î±Ï ÎºÏÎ´Î¹ÎºÏÏ ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï ÏÏÎ·Î½ Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· IM ÏÎ¿Ï ÏÏÎ¿ÏÎ¸ÎÏÎ±ÏÎµ. "
 "Î ÏÎÏÎµÎ¹ Î½Î± Î±ÏÎ¿Î´ÎµÏÏÎµÎ¯ÏÎµ ÏÎ¿Î½/ÏÎ·Î½ %s Î³Î¹Î± Î±ÏÎ¿ÏÏÎ¿Î»Î® Î¼Î·Î½ÏÎ¼Î¬ÏÏÎ½ ÏÏÎ¿Ï ÎµÏÎ±Ï. "
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr ""
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ÎÏÎÏÏÏÎµ Î· Î´Î¹Î±Î³ÏÎ±ÏÎ® email ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·Ï."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Î ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î±ÎºÏÏÏÎ¸Î·ÎºÎµ."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr ""
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Î Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ· ÏÎ¿Ï ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î¿Ï email Î±ÏÎ±Î¹ÏÎÎ¸Î·ÎºÎµ."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1990,7 +2144,9 @@ msgstr ""
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2084,7 +2240,9 @@ msgstr ""
 msgid "No nickname or ID."
 msgstr "ÎÎ®Î½ÏÎ¼Î±"
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
@@ -2093,11 +2251,13 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr ""
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr ""
@@ -2209,12 +2369,12 @@ msgstr ""
 msgid "New message"
 msgstr ""
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr ""
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr ""
 
@@ -2222,7 +2382,7 @@ msgstr ""
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2478,7 +2638,7 @@ msgid "6 or more characters"
 msgstr "6 Î® ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ¿Î¹ ÏÎ±ÏÎ±ÎºÏÎ®ÏÎµÏ"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·"
 
@@ -3827,68 +3987,109 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï OpenID"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï ÎÎ"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Î Î±ÏÏÎ¹ÎºÎ® ÏÎµÎ»Î¯Î´Î± Î´ÎµÎ½ ÎµÎ¯Î½Î±Î¹ ÎÎ³ÎºÏÏÎ¿ URL."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "ÎÎ¹ÎµÏÎ¸ÏÎ½ÏÎ· ÎÎ"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Î¤ÏÎÏÏÎ½ ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¼ÎÎ½Î¿, Î¼ÎÏÏ SMS, Î½Î¿ÏÎ¼ÎµÏÎ¿ ÎºÎ¹Î½Î·ÏÎ¿Ï ÏÎ·Î»ÎµÏÏÎ½Î¿Ï."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "ÎÎ½Î±Î¼ÎÎ½ÏÎ½ÏÎ±Ï ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Ï' Î±ÏÏÏ ÏÎ¿ Î½Î¿ÏÎ¼ÎµÏÎ¿ ÏÎ·Î»ÎµÏÏÎ½Î¿Ï."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr ""
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "ÎÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ·"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Î ÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "ÎÎ¹ ÏÏÎ¿ÏÎ¹Î¼Î®ÏÎµÎ¹Ï Î±ÏÎ¿Î¸Î·ÎºÎµÏÏÎ·ÎºÎ±Î½"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr ""
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr ""
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -3898,30 +4099,49 @@ msgstr ""
 "ÏÏÎ¿ÏÎ¸ÎÏÎ±ÏÎµ. ÎÎ»ÎÎ³Î¾ÏÎµ ÏÎ± ÎµÎ¹ÏÎµÏÏÏÎ¼ÎµÎ½Î± (ÎºÎ±Î¹ ÏÎ¿Î½ ÏÎ¬ÎºÎµÎ»Î¿ Î±Î½ÎµÏÎ¹Î¸ÏÎ¼Î·ÏÎ·Ï "
 "Î±Î»Î»Î·Î»Î¿Î³ÏÎ±ÏÎ¯Î±Ï) Î³Î¹Î± ÏÎ¿Î½ ÎºÏÎ´Î¹ÎºÏ ÎºÎ±Î¹ Î³Î¹Î± ÏÎ¿ ÏÏÏ Î½Î± ÏÎ¿Î½ ÏÏÎ·ÏÎ¹Î¼Î¿ÏÎ¿Î¹Î®ÏÎµÏÎµ."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Î ÎµÏÎ¹Î²ÎµÎ²Î±Î¯ÏÏÎ· Î±ÎºÏÏÏÎ¸Î·ÎºÎµ."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr ""
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+msgid "The SMS phone number was removed."
+msgstr ""
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr ""
 
@@ -5108,10 +5328,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "ÎÎºÏÏÏÏÎ·"
 
@@ -5186,34 +5404,40 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr ""
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ÎÏÎÏÏÏÎµ Î· ÎµÎ½Î·Î¼ÎÏÏÏÎ· ÏÏÎ®ÏÏÎ· Î¼ÎÏÏ ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¼ÎÎ½Î·Ï email Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·Ï."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "ÎÏÎÏÏÏÎµ Î· ÎµÎ½Î·Î¼ÎÏÏÏÎ· ÏÏÎ®ÏÏÎ· Î¼ÎÏÏ ÎµÏÎ¹Î²ÎµÎ²Î±Î¹ÏÎ¼ÎÎ½Î·Ï email Î´Î¹ÎµÏÎ¸ÏÎ½ÏÎ·Ï."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr ""
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5221,200 +5445,204 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "ÎÎ¼Î¬Î´ÎµÏ Î¼Îµ ÏÎ± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± Î¼ÎÎ»Î·"
 
-#: lib/command.php:331
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
 msgstr "ÎÎ´ÏÎ½Î±ÏÎ· Î· Î±ÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÏÎ½ Î½ÎÏÎ½ ÏÎ»Î·ÏÎ¿ÏÎ¿ÏÎ¹ÏÎ½ ÏÎ¿Ï ÏÏÎ¿ÏÎ¯Î»"
 
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
 #, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "Î¿Î¼Î¬Î´ÎµÏ ÏÏÎ½ ÏÏÎ·ÏÏÏÎ½ %s"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
 msgstr "ÎÎ´ÏÎ½Î±ÏÎ· Î· Î±ÏÎ¿Î¸Î®ÎºÎµÏÏÎ· ÏÎ¿Ï ÏÏÎ¿ÏÎ¯Î»."
 
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "Î¿Î¼Î¬Î´ÎµÏ ÏÏÎ½ ÏÏÎ·ÏÏÏÎ½ %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, fuzzy, php-format
 msgid "Fullname: %s"
 msgstr "ÎÎ½Î¿Î¼Î±ÏÎµÏÏÎ½ÏÎ¼Î¿"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î´Î¹Î±Î³ÏÎ±ÏÎ®Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï."
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î´Î¹Î±Î³ÏÎ±ÏÎ®Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï."
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "Î¡ÏÎ¸Î¼Î¯ÏÎµÎ¹Ï OpenID"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr ""
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr ""
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr ""
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "ÎÏÎÏÏÏÎµ Î· ÏÏÎ½Î´ÏÎ¿Î¼Î®."
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "ÎÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹Ï ÏÏÎ½Î´ÏÎ¿Î¼Î·ÏÎÏ ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï ÏÎ¿Ï Î¬Î»Î»Î¿ÏÏ."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ÎÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹Ï ÏÏÎ½Î´ÏÎ¿Î¼Î·ÏÎÏ ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï ÏÎ¿Ï Î¬Î»Î»Î¿ÏÏ."
 msgstr[1] "ÎÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹Ï ÏÏÎ½Î´ÏÎ¿Î¼Î·ÏÎÏ ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï ÏÎ¿Ï Î¬Î»Î»Î¿ÏÏ."
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "ÎÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹Ï ÏÏÎ½Î´ÏÎ¿Î¼Î·ÏÎÏ ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï ÏÎ¿Ï Î¬Î»Î»Î¿ÏÏ."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "ÎÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹Ï ÏÏÎ½Î´ÏÎ¿Î¼Î·ÏÎÏ ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï ÏÎ¿Ï Î¬Î»Î»Î¿ÏÏ."
 msgstr[1] "ÎÎµÎ½ ÎµÏÎ¹ÏÏÎÏÎµÏÎ±Î¹ Î½Î± ÎºÎ¬Î½ÎµÎ¹Ï ÏÏÎ½Î´ÏÎ¿Î¼Î·ÏÎÏ ÏÎ¿Ï Î»Î¿Î³Î±ÏÎ¹Î±ÏÎ¼Î¿Ï ÏÎ¿Ï Î¬Î»Î»Î¿ÏÏ."
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "ÎÎµÎ½ ÎµÎ¯ÏÏÎµ Î¼ÎÎ»Î¿Ï ÎºÎ±Î¼Î¯Î±Ï Î¿Î¼Î¬Î´Î±Ï."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ÎÎ¼Î¬Î´ÎµÏ Î¼Îµ ÏÎ± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± Î¼ÎÎ»Î·"
 msgstr[1] "ÎÎ¼Î¬Î´ÎµÏ Î¼Îµ ÏÎ± ÏÎµÏÎ¹ÏÏÏÏÎµÏÎ± Î¼ÎÎ»Î·"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6247,6 +6475,10 @@ msgstr ""
 msgid "Repeat this notice?"
 msgstr "ÎÎ´ÏÎ½Î±Î¼Î¯Î± Î´Î¹Î±Î³ÏÎ±ÏÎ®Ï Î±ÏÏÎ¿Ï ÏÎ¿Ï Î¼Î·Î½ÏÎ¼Î±ÏÎ¿Ï."
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "ÎÎ±Î¹"
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6439,47 +6671,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Î£ÏÎ½ÏÎ¿Î½Î¹ÏÏÎ®Ï"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr ""
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr ""
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr ""
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr ""
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr ""
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr ""
 
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index c8c06c174d..fd16a8bf71 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:33+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:30+0000\n"
 "Language-Team: British English\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: out-statusnet\n"
@@ -74,8 +74,13 @@ msgstr "Closed"
 msgid "Save access settings"
 msgstr "Save access settings"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -107,7 +112,7 @@ msgstr "No such page"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No such user."
@@ -350,7 +355,7 @@ msgstr "No status found with that ID."
 msgid "This status is already a favorite."
 msgstr "This status is already a favourite."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Could not create favourite."
 
@@ -467,7 +472,7 @@ msgstr "Group not found!"
 msgid "You are already a member of that group."
 msgstr "You are already a member of that group."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "You have been blocked from that group by the admin."
 
@@ -518,17 +523,17 @@ msgid "Invalid token."
 msgstr "Invalid token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -561,12 +566,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "The request token %s has been denied and revoked."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Unexpected form submission."
 
@@ -825,27 +833,44 @@ msgstr ""
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 "will not be notified of any @-replies from them."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Do not block this user"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Yes"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Block this user"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Failed to save block information."
 
@@ -858,8 +883,8 @@ msgstr "Failed to save block information."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "No such group."
 
@@ -918,16 +943,24 @@ msgstr "Unrecognised address type %s"
 msgid "That address has already been confirmed."
 msgstr "That address has already been confirmed."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Couldn't update user."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Couldn't delete e-mail confirmation."
 
@@ -982,11 +1015,13 @@ msgstr ""
 "about the application from the database, including all existing user "
 "connections."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Do not delete this application"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Delete this application"
 
@@ -1021,11 +1056,13 @@ msgstr "Delete notice"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Are you sure you want to delete this notice?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Do not delete this notice"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Delete this notice"
 
@@ -1049,7 +1086,8 @@ msgstr ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Delete this user"
 
@@ -1162,15 +1200,13 @@ msgid "Reset back to default"
 msgstr "Reset back to default"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Save"
 
@@ -1296,31 +1332,43 @@ msgstr "Could not create aliases"
 msgid "Options saved."
 msgstr "Options saved."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "E-mail settings"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Manage how you get e-mail from %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Address"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-mail address"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Current confirmed e-mail address."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remove"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1328,106 +1376,141 @@ msgstr ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancel"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-mail address"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mail address, like \"UserName@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Add"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Incoming e-mail"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Send e-mail to this address to post new notices."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Make a new e-mail address for posting to - cancels the old one."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Preferences"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send me notices of new subscriptions through e-mail."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Send me e-mail when someone adds my notice as a favourite."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Send me e-mail when someone sends me a private message."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send me e-mail when someone sends me an \"@-reply\"."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Allow friends to nudge me and send me an e-mail."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "I want to post notices by e-mail."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publish a MicroID for my e-mail address."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Design preferences saved."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "No e-mail address."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Cannot normalise that e-mail address"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Not a valid e-mail address."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "That is already your e-mail address."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "That e-mail address already belongs to another user."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Couldn't insert confirmation code."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1435,43 +1518,56 @@ msgstr ""
 "A confirmation code was sent to the e-mail address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "No pending confirmation to cancel."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "That is the wrong IM address."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Confirmation cancelled."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "That is not your e-mail address."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "The address was removed."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "No incoming e-mail address."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Couldn't update user record."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Incoming e-mail address removed."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "New incoming e-mail address added."
 
@@ -1665,15 +1761,17 @@ msgstr ""
 "will be removed from the group, unable to post and unable to subscribe to "
 "the group in the future."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Do not block this user from this group"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Block this user from this group"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "Database error blocking user from group."
 
@@ -1851,11 +1949,15 @@ msgstr "User is not blocked from group."
 msgid "Error removing the block."
 msgstr "Error removing the block."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "IM settings"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1864,15 +1966,24 @@ msgstr ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "IM is not available."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM address"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Current confirmed Jabber/GTalk address."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1881,11 +1992,9 @@ msgstr ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM address"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1894,44 +2003,66 @@ msgstr ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferences"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send me notices through Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publish a MicroID for my Jabber/GTalk address."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Preferences saved."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "No Jabber ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Cannot normalise Jabber ID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Not a valid Jabber ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "That is already your Jabber ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID already belongs to another user."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1940,10 +2071,35 @@ msgstr ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "That is the wrong IM address."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Couldn't delete e-mail confirmation."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Confirmation cancelled."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "That is not your Jabber ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "The address was removed."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1984,7 +2140,9 @@ msgstr "Invite new users"
 msgid "You are already subscribed to these users:"
 msgstr "You are already subscribed to these users:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2108,7 +2266,9 @@ msgstr "You must be logged in to join a group."
 msgid "No nickname or ID."
 msgstr "No nickname or ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s joined group %2$s"
@@ -2117,11 +2277,13 @@ msgstr "%1$s joined group %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "You must be logged in to leave a group."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "You are not a member of that group."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s left group %2$s"
@@ -2231,12 +2393,12 @@ msgstr "Use this form to create a new group."
 msgid "New message"
 msgstr "New message"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "You can't send a message to this user."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "No content!"
 
@@ -2244,7 +2406,7 @@ msgstr "No content!"
 msgid "No recipient specified."
 msgstr "No recipient specified."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2500,7 +2662,7 @@ msgid "6 or more characters"
 msgstr "6 or more characters"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Confirm"
 
@@ -3867,45 +4029,75 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Site notice"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "SMS settings"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "You can receive SMS messages through e-mail from %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "This page is not available in a "
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM address"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Current confirmed SMS-enabled phone number."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Awaiting confirmation on this phone number."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Confirmation code"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Enter the code you received on your phone."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirm"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "SMS phone number"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Phone number, no punctuation or spaces, with area code"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferences"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3913,23 +4105,34 @@ msgstr ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Preferences saved."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "No phone number."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "No carrier selected."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "That is already your phone number."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "That phone number already belongs to another user."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -3937,23 +4140,42 @@ msgstr ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "That is the wrong confirmation number."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Confirmation cancelled."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "That is not your phone number."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS phone number"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Mobile carrier"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Select a carrier"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3962,7 +4184,8 @@ msgstr ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "No code entered"
 
@@ -5162,10 +5385,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Cancel"
 
@@ -5239,34 +5460,40 @@ msgstr "Command failed"
 msgid "Notice with that id does not exist"
 msgstr "Notice with that id does not exist"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "User has no last notice"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Could not find a user with nickname %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Could not find a user with nickname %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Sorry, this command is not yet implemented."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Nudge sent to %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5274,196 +5501,200 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "You are already a member of that group."
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Could not join user %s to group %s."
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s joined group %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Could not join user %1$s to group %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "Could not remove user %s to group %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s left group %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullname: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Message too long - maximum is %1$d characters, you sent %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Direct message to %s sent"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Error sending direct message."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "Cannot repeat your own notice."
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "Already repeated that notice."
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Notice from %s repeated"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Error repeating notice."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Notice too long - maximum is %d characters, you sent %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Reply to %s sent"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Error saving notice."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Specify the name of the user to subscribe to"
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "You are not subscribed to that profile."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Subscribed to %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Specify the name of the user to unsubscribe from"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Unsubscribed from %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Notification off."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Notification on."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "Unsubscribed  %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to anyone."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "You are already subscribed to these users:"
 msgstr[1] "You are already subscribed to these users:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "No one is subscribed to you."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Could not subscribe other to you."
 msgstr[1] "Could not subscribe other to you."
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "You are not a member of any groups."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "You are not a member of that group."
 msgstr[1] "You are not a member of that group."
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6304,6 +6535,10 @@ msgstr "No return-to arguments."
 msgid "Repeat this notice?"
 msgstr "Repeat this notice?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Yes"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repeat this notice"
@@ -6492,47 +6727,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "a few seconds ago"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "about a minute ago"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "about %d minutes ago"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "about an hour ago"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "about %d hours ago"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "about a day ago"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "about %d days ago"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "about a month ago"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "about %d months ago"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "about a year ago"
 
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index f714ea20ff..117947d5aa 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -13,12 +13,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:36+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:33+0000\n"
 "Language-Team: Spanish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: out-statusnet\n"
@@ -76,8 +76,13 @@ msgstr "Cerrado"
 msgid "Save access settings"
 msgstr "Guardar la configuraciÃ³n de acceso"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Guardar"
@@ -107,7 +112,7 @@ msgstr "No existe tal pÃ¡gina."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existe ese usuario."
@@ -348,7 +353,7 @@ msgstr "No se encontrÃ³ estado para ese ID"
 msgid "This status is already a favorite."
 msgstr "Este status ya estÃ¡ en favoritos."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "No se pudo crear favorito."
 
@@ -466,7 +471,7 @@ msgstr "Grupo no encontrado."
 msgid "You are already a member of that group."
 msgstr "Ya eres miembro de ese grupo"
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "Has sido bloqueado de ese grupo por el administrador."
 
@@ -517,17 +522,17 @@ msgid "Invalid token."
 msgstr "Token invÃ¡lido."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -563,12 +568,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "El token de solicitud %2 ha sido denegado y revocado."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "EnvÃo de formulario inesperado."
 
@@ -828,27 +836,44 @@ msgstr ""
 "desuscribirÃ¡ de tu cuenta, no podrÃ¡ suscribirse a ella en el futuro y no se "
 "te notificarÃ¡ de ninguna de sus respuestas @."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "No bloquear a este usuario"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "SÃ"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Bloquear este usuario."
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "No se guardÃ³ informaciÃ³n de bloqueo."
 
@@ -861,8 +886,8 @@ msgstr "No se guardÃ³ informaciÃ³n de bloqueo."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "No existe ese grupo."
 
@@ -922,16 +947,24 @@ msgstr "Tipo de direcciÃ³n %s desconocida."
 msgid "That address has already been confirmed."
 msgstr "Esa direcciÃ³n ya fue confirmada."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "No se pudo actualizar el usuario."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "No se pudo eliminar la confirmaciÃ³n de correo electrÃ³nico."
 
@@ -986,11 +1019,13 @@ msgstr ""
 "los datos acerca de la aplicaciÃ³n de la base de datos, incluyendo todas las "
 "conexiones de usuario existente."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "No eliminar esta aplicaciÃ³n"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Borrar esta aplicaciÃ³n"
 
@@ -1025,11 +1060,13 @@ msgstr "Borrar aviso"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Â¿EstÃ¡s seguro de que quieres eliminar este aviso?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "No eliminar este mensaje"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Borrar este aviso"
 
@@ -1053,7 +1090,8 @@ msgstr ""
 "Â¿Realmente deseas eliminar este usuario? Esto borrarÃ¡ de la base de datos "
 "todos los datos sobre el usuario, sin dejar una copia de seguridad."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Borrar este usuario"
 
@@ -1166,15 +1204,13 @@ msgid "Reset back to default"
 msgstr "Volver a los valores predeterminados"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Guardar"
 
@@ -1300,31 +1336,43 @@ msgstr "No fue posible crear alias."
 msgid "Options saved."
 msgstr "Se guardÃ³ Opciones."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ConfiguraciÃ³n del correo electrÃ³nico"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestiona la forma en que recibes correo desde %%site.name%%"
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "DirecciÃ³n"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "DirecciÃ³n de correo electrÃ³nico"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Actual direcciÃ³n de correo electrÃ³nico confirmada"
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1332,109 +1380,144 @@ msgstr ""
 "Esperando confirmaciÃ³n de esta direcciÃ³n. Revisa tu bandeja de entrada (Â¡y "
 "la de spam!) por un mensaje con las instrucciones."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "DirecciÃ³n de correo electrÃ³nico"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Correo electrÃ³nico, como \"NombredeUsuario@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "AÃ±adir"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Correo entrante"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Envie emails a esta direcciÃ³n para ingresar nuevos avisos"
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Hace una nueva direcciÃ³n de correo para postear; cancela la anterior."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuevo"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Preferencias"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviarme avisos de suscripciones nuevas por correo."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Enviarme un correo electrÃ³nico cuando alguien agrega mi aviso a favoritos."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Enviarme un correo electrÃ³nico cuando alguien me envÃa un mensaje privado."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Enviarme un correo electrÃ³nico cuando alguien me envÃe una \"@-respuesta\"."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir que amigos me contacten y enviÃ©n un correo."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Deseo enviar estados por email"
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar un MicroID para mi direcciÃ³n de correo."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Preferencias guardadas."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Preferencias de diseÃ±o guardadas."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Sin direcciÃ³n de correo electrÃ³nico"
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "No se puede normalizar esta direcciÃ³n de correo electrÃ³nico."
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correo electrÃ³nico no vÃ¡lido"
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Esa ya es tu direcciÃ³n de correo electrÃ³nico"
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Esa direcciÃ³n de correo pertenece a otro usuario."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "No se pudo insertar el cÃ³digo de confirmaciÃ³n."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1443,43 +1526,56 @@ msgstr ""
 "Revisa tu bandeja de entrada (Â¡y la de spam!) para encontrar el cÃ³digo y las "
 "instrucciones sobre cÃ³mo usarlo."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ninguna confirmaciÃ³n pendiente para cancelar."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Esa direcciÃ³n de mensajerÃa instantÃ¡nea es incorrecta."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "ConfirmaciÃ³n cancelada."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Esa no es tu direcciÃ³n de correo electrÃ³nico"
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "La direcciÃ³n fue eliminada."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "No hay direcciÃ³n de correo entrante."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "No se pudo actualizar informaciÃ³n de usuario."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "DirecciÃ³n de correo entrante removida."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nueva direcciÃ³n de correo entrante agregada."
 
@@ -1670,15 +1766,17 @@ msgstr ""
 "eliminarÃ¡ del grupo y no podrÃ¡ publicar ni suscribirse al grupo en lo "
 "sucesivo."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "No bloquear este usuario de este grupo"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Bloquear este usuario de este grupo"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 "Se ha producido un error en la base de datos al bloquear el usuario del "
@@ -1863,11 +1961,15 @@ msgstr "El usuario no estÃ¡ bloqueado del grupo."
 msgid "Error removing the block."
 msgstr "Se ha producido un error al eliminar el bloque."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "ConfiguraciÃ³n de mensajerÃa instantÃ¡nea"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1876,15 +1978,24 @@ msgstr ""
 "Puedes enviar y recibir avisos vÃa [mensajes instantÃ¡neos](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu direcciÃ³n y opciones abajo."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "La mensajerÃa instantÃ¡nea no estÃ¡ disponible."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "DirecciÃ³n de mensajerÃa instantÃ¡nea"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "DirecciÃ³n actual Jabber/Gtalk confirmada."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1894,11 +2005,9 @@ msgstr ""
 "Jabber/GTalk un mensaje con mÃ¡s instrucciones. (Â¿Has aÃ±adido a %s a tu lista "
 "de amigos?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "DirecciÃ³n de mensajerÃa instantÃ¡nea"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1908,44 +2017,66 @@ msgstr ""
 "Primero, asegÃºrate de agregar a %s a tu lista de amigos en tu cliente de "
 "mensajerÃa instantÃ¡nea o en GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviarme avisos por Jabber/GTalk"
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Enviar un aviso cuando el estado de mi Jabber/GTalk cambie."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Envirame respuestas por medio de Jabber/GTalk de gente a la cual no sigo."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar un MicroID para mi cuenta Jabber/GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Preferencias guardadas."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "NingÃºn Jabber ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "No se puede normalizar este Jabber ID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID no vÃ¡lido"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Ese ya es tu Jabber ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "El Jabber ID ya pertenece a otro usuario."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1955,10 +2086,35 @@ msgstr ""
 "instantÃ¡nea que agregaste. Debes aprobar a %s para que pueda enviarte "
 "mensajes."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Esa direcciÃ³n de mensajerÃa instantÃ¡nea es incorrecta."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "No se pudo eliminar la confirmaciÃ³n de correo electrÃ³nico."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "ConfirmaciÃ³n cancelada."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Ese no es tu Jabber ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "La direcciÃ³n fue eliminada."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2000,7 +2156,9 @@ msgstr "Invitar nuevos usuarios:"
 msgid "You are already subscribed to these users:"
 msgstr "Ya estÃ¡s suscrito a estos usuarios:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2123,7 +2281,9 @@ msgstr "Debes estar conectado para unirte a un grupo."
 msgid "No nickname or ID."
 msgstr "NingÃºn nombre de usuario o ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s se ha unido al grupo %2$"
@@ -2132,11 +2292,13 @@ msgstr "%1$s se ha unido al grupo %2$"
 msgid "You must be logged in to leave a group."
 msgstr "Debes estar conectado para dejar un grupo."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "No eres miembro de este grupo."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s ha dejado el grupo %2$s"
@@ -2248,12 +2410,12 @@ msgstr "Usa este formulario para crear un grupo nuevo."
 msgid "New message"
 msgstr "Nuevo Mensaje "
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "No puedes enviar mensaje a este usuario."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Â¡NingÃºn contenido!"
 
@@ -2261,7 +2423,7 @@ msgstr "Â¡NingÃºn contenido!"
 msgid "No recipient specified."
 msgstr "No se especificÃ³ receptor."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No te auto envÃes un mensaje; dÃcetelo a ti mismo."
@@ -2521,7 +2683,7 @@ msgid "6 or more characters"
 msgstr "6 o mÃ¡s caracteres"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -3922,45 +4084,75 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Guardar el aviso del sitio"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "ConfiguraciÃ³n de SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Puedes recibir mensajes SMS por correo electrÃ³nico desde %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "SMS no estÃ¡ disponible."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "DirecciÃ³n de mensajerÃa instantÃ¡nea"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Actual nÃºmero telefÃ³nico para SMS confirmado."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Esperando confirmaciÃ³n de este nÃºmero de telÃ©fono."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "CÃ³digo de confirmaciÃ³n"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Ingrese el cÃ³digo recibido en su telÃ©fono"
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "NÃºmero de telÃ©fono de SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "NÃºmero telefÃ³nico, sin puntuaciÃ³n ni espacios, incluya cÃ³digo de Ã¡rea"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3968,23 +4160,34 @@ msgstr ""
 "Enviarme avisos por SMS; Yo acepto que puede incurrir en grandes cobros por "
 "mi operador mÃ³vil"
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Preferencias guardadas."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Sin nÃºmero telefÃ³nico"
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "No se seleccionÃ³ un operador mÃ³vil."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Ese ya es tu nÃºmero telefÃ³nico"
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Ese nÃºmero telefÃ³nico ya pertenece a otro usuario"
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -3993,23 +4196,42 @@ msgstr ""
 "Revisa tu telÃ©fono para encontrar el cÃ³digo y las instrucciones acerca de "
 "cÃ³mo usarlo."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Ese no es el nÃºmero de confirmaciÃ³n"
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "ConfirmaciÃ³n cancelada."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Ese no es tu nÃºmero telefÃ³nico"
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "NÃºmero de telÃ©fono de SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Operador de telefonÃa mÃ³vil"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Seleccione un operador mÃ³vil"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4019,7 +4241,8 @@ msgstr ""
 "sobre correo electrÃ³nico pero no estÃ¡ listado aquÃ, envÃanos un correo para "
 "informarnos al %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "No ingresÃ³ cÃ³digo"
 
@@ -5220,10 +5443,8 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Acceso predeterminado para esta aplicaciÃ³n: sÃ³lo lectura o lectura-escritura"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -5299,35 +5520,41 @@ msgstr "Comando fallÃ³"
 msgid "Notice with that id does not exist"
 msgstr "No existe ningÃºn mensaje con ese id"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "Usuario no tiene Ãºltimo aviso"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "No se pudo encontrar a nadie con el nombre de usuario %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr ""
 "No se pudo encontrar a ningÃºn usuario local con el nombre de usuario %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Disculpa, todavÃa no se implementa este comando."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Â¡No tiene sentido darte un toque a ti mismo!"
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "zumbido enviado a %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5338,57 +5565,55 @@ msgstr ""
 "Suscriptores: %2$s\n"
 "Avisos: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Aviso marcado como favorito."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Ya eres parte de ese grupo"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
 msgstr "No se pudo unir el usuario %s al grupo %s"
 
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s se uniÃ³ a grupo %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "No se pudo eliminar al usuario %s del grupo %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s dejÃ³ grupo %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nombre completo: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "PÃ¡gina de inicio: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5397,139 +5622,145 @@ msgstr ""
 "%s es un perfil remoto: sÃ³lo puedes enviarle mensajes directos a usuarios en "
 "el mismo servidor."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Mensaje muy largo - el mÃ¡ximo es de %d caracteres. Has enviado %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Mensaje muy largo - mÃ¡ximo %1$d caracteres, enviaste %2$d"
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Se enviÃ³ mensaje directo a %s"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Error al enviar mensaje directo."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "No puedes repetir tu propio aviso"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "Ya has repetido este aviso"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Aviso de %s repetido"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Ha habido un error al repetir el aviso."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Mensaje muy largo - el mÃ¡ximo es de %d caracteres. Has enviado %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Responder a %s enviados"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Error al guardar el aviso."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especificar el nombre del usuario a suscribir"
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "No te puedes suscribir a perfiles de OMB por orden."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Suscrito a %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especificar el nombre del usuario para desuscribirse de"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Desuscrito de %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "TodavÃa no se implementa comando."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "NotificaciÃ³n no activa."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "No se puede desactivar notificaciÃ³n."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "NotificaciÃ³n activada."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "No se puede activar notificaciÃ³n."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "El comando de inicio de sesiÃ³n estÃ¡ desactivado"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 "Este enlace es utilizable solamente una vez y sÃ³lo vÃ¡lido por 2 minutos: %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "Desuscrito de %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "No estÃ¡s suscrito a nadie."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ya estÃ¡s suscrito a estos usuarios:"
 msgstr[1] "Ya estÃ¡s suscrito a estos usuarios:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "Nadie estÃ¡ suscrito a ti."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "No se pudo suscribir otro a ti."
 msgstr[1] "No se pudo suscribir otro a ti."
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "No eres miembro de ningÃºn grupo"
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Eres miembro de este grupo:"
 msgstr[1] "Eres miembro de estos grupos:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6388,6 +6619,10 @@ msgstr "No hay respuesta a los argumentos."
 msgid "Repeat this notice?"
 msgstr "Responder este aviso?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "SÃ"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Responder este aviso."
@@ -6577,47 +6812,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "hace unos segundos"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "hace un minuto"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "hace %d minutos"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "hace una hora"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "hace %d horas"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "hace un dÃa"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "hace %d dÃas"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "hace un mes"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "hace %d meses"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "hace un aÃ±o"
 
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index db5deb6e32..00af27de49 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:52+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:39+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "X-Language-Code: fa\n"
 "X-Message-Group: out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 
 #. TRANS: Page title
@@ -75,8 +75,13 @@ msgstr "ÙØ³Ø¯ÙØ¯"
 msgid "Save access settings"
 msgstr "Ø°Ø®ÛØ±ÙâÛ ØªÙØ¸ÛÙØ§Øª Ø¯Ø³ØªØ±Ø³Û"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Ø°Ø®ÛØ±Ù"
@@ -107,7 +112,7 @@ msgstr "ÚÙÛÙ ØµÙØÙâØ§Û ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ÚÙÛÙ Ú©Ø§Ø±Ø¨Ø±Û ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
@@ -344,7 +349,7 @@ msgstr "ÙÛÚ ÙØ¶Ø¹ÛØªÛ Ø¨Ø§ Ø¢Ù Ø´ÙØ§Ø³Ù Ù¾ÛØ¯Ø§ ÙØ´Ø¯."
 msgid "This status is already a favorite."
 msgstr "Ø§ÛÙ Ù¾ÛØºØ§Ù Ø±Ø§ Ù¾ÛØ´âØªØ± Ø¨Ù Ø¹ÙØ§ÛÙ Ø®ÙØ¯ Ø§Ø¶Ø§ÙÙ Ú©Ø±Ø¯ÙâØ§ÛØ¯"
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "ÙÙÛâØªÙØ§Ù ÙØ¶Ø¹ÛØª Ø±Ø§ ÙÙØ±Ø¯Ø¹ÙØ§ÙÙ Ú©Ø±Ø¯."
 
@@ -461,7 +466,7 @@ msgstr "Ú¯Ø±ÙÙ ÛØ§ÙØª ÙØ´Ø¯!"
 msgid "You are already a member of that group."
 msgstr "Ø´ÙØ§ Ø§Ø² Ù¾ÛØ´ ÛÚ© Ø¹Ø¶Ù Ø§ÛÙ Ú¯Ø±ÙÙ ÙØ³ØªÛØ¯."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "Ø¯Ø³ØªØ±Ø³Û Ø´ÙØ§ Ø¨Ù Ú¯Ø±ÙÙ ØªÙØ³Ø· ÙØ¯ÛØ± Ø¢Ù ÙØØ¯ÙØ¯ Ø´Ø¯Ù Ø§Ø³Øª."
 
@@ -513,17 +518,17 @@ msgid "Invalid token."
 msgstr "Ø§ÙØ¯Ø§Ø²ÙâÛ ÙØ§Ø¯Ø±Ø³Øª"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -555,12 +560,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Ø§Ø±Ø³Ø§Ù ØºÛØ± ÙØ§Ø¨Ù Ø§ÙØªØ¸Ø§Ø± ÙØ±Ù."
 
@@ -821,27 +829,44 @@ msgstr ""
 "Ø¯ÙØ¨Ø§Ù Ú©ÙØ¯. ÙÙÚÙÛÙ Ø¯ÛÚ¯Ø± Ø´ÙØ§ Ø§Ø² Ù¾ÛØ§ÙâÙØ§ÛÛ Ú©Ù Ø¯Ø± Ø¢Ù Ø§Ø² Ø´ÙØ§ ÛØ§Ø¯ ÙÛâÚ©ÙØ¯ Ø¨Ø§ Ø®Ø¨Ø± "
 "ÙØ®ÙØ§ÙÛØ¯ Ø´Ø¯"
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Ø®ÛØ±"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ ÙØ³Ø¯ÙØ¯ ÙÚ©Ù"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ø¨ÙÙ"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ ÙØ³Ø¯ÙØ¯ Ú©Ù"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr ""
 
@@ -854,8 +879,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "ÚÙÛÙ Ú¯Ø±ÙÙÛ ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
@@ -914,16 +939,24 @@ msgstr "ÙÙØ¹ ÙØ´Ø§ÙÛ ÙØ§ÙØ´Ø®Øµ Ø§Ø³Øª %s"
 msgid "That address has already been confirmed."
 msgstr "Ø¢Ù ÙØ´Ø§ÙÛ Ø¯Ø± ØØ§Ù ØØ§Ø¶Ø± ØªØµØ¯ÛÙ Ø´Ø¯Ù Ø§Ø³Øª."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø¨Ù Ø±ÙØ² Ú©Ø±Ø¯."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÙÙÛâØªÙØ§Ù ØªØµØ¯ÛÙ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© Ø±Ø§ Ù¾Ø§Ú© Ú©Ø±Ø¯."
 
@@ -983,12 +1016,14 @@ msgstr ""
 "Ø¢ÛØ§ ÙØ·ÙØ¦Ù ÙØ³ØªÛØ¯ Ú©Ù ÙÛâØ®ÙØ§ÙÛØ¯ Ø§ÛÙ Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ù¾Ø§Ú© Ú©ÙÛØ¯Ø Ø¨Ø§ Ø§ÛÙ Ú©Ø§Ø± ØªÙØ§Ù Ø§Ø·ÙØ§Ø¹Ø§Øª "
 "Ù¾Ø§Ú© Ù Ø¨Ø¯ÙÙ Ø¨Ø±Ú¯Ø´Øª Ø®ÙØ§ÙÙØ¯ Ø¨ÙØ¯."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "Ø§ÛÙ Ù¾ÛØ§Ù Ø±Ø§ Ù¾Ø§Ú© ÙÚ©Ù"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "Ø§ÛÙ Ù¾ÛØ§Ù Ø±Ø§ Ù¾Ø§Ú© Ú©Ù"
@@ -1024,11 +1059,13 @@ msgstr "Ù¾ÛØ§Ù Ø±Ø§ Ù¾Ø§Ú© Ú©Ù"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ø¢ÛØ§ Ø§Ø·ÙÛÙØ§Ù Ø¯Ø§Ø±ÛØ¯ Ú©Ù ÙÛâØ®ÙØ§ÙÛØ¯ Ø§ÛÙ Ù¾ÛØ§Ù Ø±Ø§ Ù¾Ø§Ú© Ú©ÙÛØ¯Ø"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Ø§ÛÙ Ù¾ÛØ§Ù Ø±Ø§ Ù¾Ø§Ú© ÙÚ©Ù"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Ø§ÛÙ Ù¾ÛØ§Ù Ø±Ø§ Ù¾Ø§Ú© Ú©Ù"
 
@@ -1052,7 +1089,8 @@ msgstr ""
 "Ø¢ÛØ§ ÙØ·ÙØ¦Ù ÙØ³ØªÛØ¯ Ú©Ù ÙÛâØ®ÙØ§ÙÛØ¯ Ø§ÛÙ Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ù¾Ø§Ú© Ú©ÙÛØ¯Ø Ø¨Ø§ Ø§ÛÙ Ú©Ø§Ø± ØªÙØ§Ù Ø§Ø·ÙØ§Ø¹Ø§Øª "
 "Ù¾Ø§Ú© Ù Ø¨Ø¯ÙÙ Ø¨Ø±Ú¯Ø´Øª Ø®ÙØ§ÙÙØ¯ Ø¨ÙØ¯."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "ØØ°Ù Ø§ÛÙ Ú©Ø§Ø±Ø¨Ø±"
 
@@ -1165,15 +1203,13 @@ msgid "Reset back to default"
 msgstr "Ø¨Ø±Ú¯Ø´Øª Ø¨Ù ØØ§ÙØª Ù¾ÛØ´ Ú¯Ø²ÛØ¯Ù"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Ø°Ø®ÛØ±ÙâÚ©Ø±Ø¯Ù"
 
@@ -1309,139 +1345,186 @@ msgstr "ÙÙÛâØªÙØ§Ù ÙØ§ÙâÙØ§Û ÙØ³ØªØ¹Ø§Ø± Ø±Ø§ Ø³Ø§Ø®Øª."
 msgid "Options saved."
 msgstr "Ú¯Ø²ÛÙÙâÙØ§ Ø°Ø®ÛØ±Ù Ø´Ø¯ÙØ¯."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "ØªÙØ¸ÛÙØ§Øª Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "ÚÚ¯ÙÙÚ¯Û Ø¯Ø±ÛØ§ÙØª ÙØ§ÙÙ Ø§Ø² %%site.name%% Ø±Ø§ Ø§Ø¯Ø§Ø±Ù Ú©ÙÛØ¯."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "ÙØ´Ø§ÙÛ"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "ÙØ´Ø§ÙÛâÙØ§Û Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©Û"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "ÙØ´Ø§ÙÛ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©Û ØªØ§ÛÛØ¯ Ø´Ø¯ÙÙ Ú©ÙÙÙÛ"
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "ØØ°Ù"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Ø§ÙØµØ±Ø§Ù"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "ÙØ´Ø§ÙÛâÙØ§Û Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©Û"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ÙØ´Ø§ÙÛ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©ÛØ ÙØ§ÙÙØ¯ Â«UserName@example.orgÂ»"
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ø§ÙØ²ÙØ¯Ù"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© ÙØ±ÙØ¯Û"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Ø¨Ø±Ø§Û Ø§Ø±Ø³Ø§Ù Ù¾ÛØ§Ù Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© Ø¨Ù Ø§ÛÙ ÙØ´Ø§ÙÛ ÙØ§ÙÙ Ø¨ÙØ±Ø³ØªÛØ¯."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "ÙØ´Ø§ÙÛ Ø¬Ø¯ÛØ¯ Ø¨Ø±Ø§Û Ø§Ø±Ø³Ø§Ù Ù¾ÛØ§Ù Ø§ÛØ¬Ø§Ø¯ Ú©ÙØ ÙØ´Ø§ÙÛ ÙØ¨ÙÛ ÙØ³Ø® ÙÛâØ´ÙØ¯."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Ø¬Ø¯ÛØ¯"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "ØªØ±Ø¬ÛØØ§Øª"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Ù¾ÛØ§ÙâÙØ§Û Ú©Ø³Ø§ÙÛ Ø±Ø§ Ú©Ù Ø¨Ù ØªØ§Ø²Ú¯Û Ø¯ÙØ¨Ø§Ù ÙÛâÚ©ÙÙ Ø¨Ø§ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© Ø¨Ø±Ø§ÛÙ Ø¨ÙØ±Ø³Øª."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "ÙØ± ÙÙØª Ú©Ø³Û Ù¾ÛØ§Ù ÙØ§Û ÙØ±Ø§ Ø¯ÙØ³Øª Ø¯Ø§Ø´ØªÙÛ Ú©Ø±Ø¯Ø ÙØ±Ø§ Ø¨Ø§ Ù¾Ø³Øª Ø§Ú©ØªØ±ÙÙÛÚ© Ø¨Ø§ Ø®Ø¨Ø± Ú©Ù."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "ÙØ± ÙÙØª Ú©Ø³Û Ø¨Ø±Ø§Û ÙÙ Ù¾ÛØ§Ù Ø®ØµÙØµÛ ÙØ±Ø³ØªØ§Ø¯Ø ÙØ±Ø§ Ø¨Ø§ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© Ø¨Ø§ Ø®Ø¨Ø± Ú©Ù."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ÙØ± ÙÙØª Ú©Ø³Û Ø§Ø² ÙÙ Ø¯Ø± Ù¾ÛØ§Ù Ø®ÙØ¯ ÛØ§Ø¯ Ú©Ø±Ø¯Ø ÙØ±Ø§ Ø¨Ø§ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© Ø¨Ø§ Ø®Ø¨Ø± Ú©Ù."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Ø§Ø¬Ø§Ø²Ù Ø¨Ø¯Ù Ø¯ÙØ³ØªØ§Ù ØªÙØ¬Ù ÙØ±Ø§ Ø¬Ø°Ø¨ Ú©ÙÙØ¯ Ù Ø¨Ù ÙÙ ÙØ§ÙÙ Ø¨ÙØ±Ø³ØªÙØ¯."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "ÙÛâØ®ÙØ§ÙÙ Ø¨Ø§ ÙØ§ÙÙ Ù¾ÛØ§Ù Ø§Ø±Ø³Ø§Ù Ú©ÙÙ."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "ÛÚ© Ø´ÙØ§Ø³Ù Ø¨Ø±Ø§Û Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ©  ÙÙ ÙÙØªØ´Ø± Ú©Ù."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "ØªÙØ¸ÛÙØ§Øª Ø°Ø®ÛØ±Ù Ø´Ø¯."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "ØªØ±Ø¬ÛØØ§Øª Ø·Ø±Ø Ø°Ø®ÛØ±Ù Ø´Ø¯."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "ÙÙÛâØªÙØ§Ù ÙØ´Ø§ÙÛ Ø±Ø§ ÙØ§ÙÙÙÛ Ú©Ø±Ø¯"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÛÚ© Ø¢Ø¯Ø±Ø³ Ø§ÛÙÛÙ ÙØ¹ØªØ¨Ø± ÙÛØ³Øª."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "ÙÙ Ø§Ú©ÙÙÙ ÙØ´Ø§ÙÛ Ø´ÙØ§ ÙÙÛÙ Ø§Ø³Øª."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Ø§ÛÙ ÙØ´Ø§ÙÛ Ø¯Ø± ØØ§Ù ØØ§Ø¶Ø± ÙØªØ¹ÙÙ Ø¨Ù ÙØ±Ø¯ Ø¯ÛÚ¯Ø±Û Ø§Ø³Øª."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÙÙÛâØªÙØ§Ù Ú©Ø¯ ØªØ§ÛÛØ¯ Ø±Ø§ Ø§Ø¶Ø§ÙÙ Ú©Ø±Ø¯."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1449,43 +1532,56 @@ msgstr ""
 "Ú©Ø¯ ØªØ§ÛÛØ¯ Ø¨Ù ÙØ´Ø§ÙÛ Ø´ÙØ§ Ø§Ø±Ø³Ø§Ù Ø´Ø¯. ÙØ§ÙÙ ÙØ§Û Ø®ÙØ¯ Ø±Ø§ Ø¨Ø±Ø±Ø³Û Ú©ÙÛØ¯ Ø¨Ø±Ø§Û Ú©Ø¯ ØªØ§ÛÛØ¯ Ù "
 "Ø±Ø§Ù Ø§Ø³ØªÙØ§Ø¯Ù."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ÙÛÚ ØªØ§ÛÛØ¯Û Ø¨Ø±Ø§Û ÙØ³Ø® Ú©Ø±Ø¯Ù ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "ÙØ´Ø§ÙÛ Ù¾ÛØ§Ù Ø±Ø³Ø§Ù Ø§Ø´ØªØ¨Ø§Ù Ø§Ø³Øª."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "ØªØ§ÛÛØ¯ ÙØ³Ø® Ø´Ø¯."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Ø¢Ù ÙØ´Ø§ÙÛ Ø´ÙØ§ ÙÛØ³Øª."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "ÙØ´Ø§ÙÛ Ù¾Ø§Ú© Ø´Ø¯Ù Ø§Ø³Øª."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÙÛÚ ÙØ´Ø§ÙÛ ÙØ±ÙØ¯Û ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÙÙÛâØªÙØ§Ù Ø§Ø·ÙØ§Ø¹Ø§Øª Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø¨Ù Ø±ÙØ² Ú©Ø±Ø¯."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ÙØ´Ø§ÙÛ ÙØ±ÙØ¯Û Ù¾Ø§Ú© Ø´Ø¯."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ÙØ´Ø§ÙÛ ÙØ±ÙØ¯Û Ø¬Ø¯ÛØ¯ Ø§Ø¶Ø§ÙÙ Ø´Ø¯."
 
@@ -1675,15 +1771,17 @@ msgid ""
 "the group in the future."
 msgstr "Ø¢ÛØ§ ÙØ·ÙØ¦Ù ÙØ³ØªÛØ¯ ÙÛâØ®ÙØ§ÙÛØ¯ Ø¯Ø³ØªØ±Ø³Û Â»%sÂ« Ø±Ø§ Ø¨Ù Ú¯Ø±ÙÙ Â»%sÂ« ÙØ³Ø¯ÙØ¯ Ú©ÙÛØ¯Ø"
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Ø¯Ø³ØªØ±Ø³Û Ú©Ø§Ø±Ø¨Ø± Ø¨Ù Ú¯Ø±ÙÙ Ø±Ø§ ÙØ³Ø¯ÙØ¯ ÙÚ©Ù"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Ø¯Ø³ØªØ±Ø³Û Ú©Ø§Ø±Ø¨Ø± Ø±Ø§ Ø¨Ù Ú¯Ø±ÙÙ ÙØ³Ø¯ÙØ¯ Ú©Ù"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "Ø§Ø´Ú©Ø§Ù Ù¾Ø§ÛÚ¯Ø§Ù Ø¯Ø§Ø¯Ù Ø¯Ø± ÙØ³Ø¯ÙØ¯ Ú©Ø±Ø¯Ù Ú©Ø§Ø±Ø¨Ø±"
 
@@ -1860,12 +1958,16 @@ msgstr "Ú©Ø§Ø±Ø¨Ø± Ø§Ø² Ú¯Ø±ÙÙ ÙÙØ¹ ÙØ´Ø¯Ù Ø§Ø³Øª."
 msgid "Error removing the block."
 msgstr "Ø§Ø´Ú©Ø§Ù Ø¯Ø± Ù¾Ø§Ú©Ø³Ø§Ø²Û"
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "ØªÙØ¸ÛÙØ§Øª Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ÙÙØ±Û"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1874,15 +1976,25 @@ msgstr ""
 "Ø´ÙØ§ ÙÛâØªÙØ§ÙÛØ¯ Ù¾ÛØ§ÙâÙØ§Û Ø®ÙØ¯ Ø±Ø§ Ø¨Ø§ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² [Ù¾ÛØ§ÙâØ±Ø³Ø§ÙâÙØ§Û](%%doc.im%%) Jabber "
 "ÛØ§ Gtalk Ø§Ø±Ø³Ø§Ù/Ø¯Ø±ÛØ§ÙØª Ú©ÙÛØ¯. ÙØ´Ø§ÙÛ Ø®ÙØ¯ Ø±Ø§ Ø¯Ø± Ø§ÛÙ ÙØ³ÙØª ØªÙØ¸ÛÙ Ú©ÙÛØ¯"
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ÙÙØ±Û Ø¯Ø± Ø¯Ø³ØªØ±Ø³ ÙÛØ³Øª."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "ÙØ´Ø§ÙÛ Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ÙÙØ±Û"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ÙØ´Ø§ÙÛ Jabber/GTalk ØªØ§ÛÛØ¯ Ø´Ø¯Ù Ú©ÙÙÙÛ"
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1891,12 +2003,9 @@ msgstr ""
 "ÙÙØªØ¸Ø± ØªØ§ÛÛØ¯ Ø§ÛÙ ÙØ´Ø§ÙÛ ÙØ³ØªÛÙ. ÙØ·ÙØ§ Jabber/Gtalk Ø®ÙØ¯ Ø±Ø§ Ø¨Ø±Ø§Û Ø¯Ø±ÛØ§ÙØª ØªÙØ¶ÛØØ§Øª "
 "Ø¨ÛØ´âØªØ± Ø¨Ø±Ø±Ø³Û Ú©ÙÛØ¯. (Ø¢ÛØ§ %s Ø±Ø§ Ø¨Ù ÙÙØ±Ø³Øª Ø®ÙØ¯ Ø§Ø¶Ø§ÙÙ Ú©Ø±Ø¯Ù Ø§ÛØ¯Ø) "
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "ÙØ´Ø§ÙÛ Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ÙÙØ±Û"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1905,44 +2014,66 @@ msgstr ""
 "ÙØ´Ø§ÙÛ Jabber ÛØ§ GTalkØ ÙØ§ÙÙØ¯ Â«UserName@example.orgÂ». Ø§Ø¨ØªØ¯Ø§ Ø§Ø² Ø§Ø¶Ø§ÙÙ Ú©Ø±Ø¯Ù %s "
 "Ø¨Ù ÙÙØ±Ø³Øª Ø¯ÙØ³ØªØ§Ù Ø®ÙØ¯ Ø¯Ø± Ú©Ø§Ø±Ú¯ÛØ± Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ÙÙØ±ÛâØªØ§Ù ÛØ§ Ø¯Ø± GTalk ÙØ·ÙØ¦Ù Ø´ÙÛØ¯."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "ØªØ±Ø¬ÛØØ§Øª"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Ø¢Ú¯ÙÛâÙØ§ Ø±Ø§ Ø§Ø² Ø±Ø§Ù Jabber/GTalk Ø¨Ø±Ø§Û ÙÙ Ø¨ÙØ±Ø³Øª."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "ÙØ± ÙÙØª Ú©Ù ÙØ¶Ø¹ÛØª Jabber/Gtalk ÙÙ ÙØ±Ù Ú©Ø±Ø¯Ø ÛÚ© Ù¾ÛØ§Ù Ø§Ø±Ø³Ø§Ù Ú©Ù."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Ø¬ÙØ§Ø¨ Ú©Ø³Ø§ÙÛ Ú©Ù ÙÙ Ø¢Ù ÙØ§ Ø±Ø§ Ø¯ÙØ¨Ø§Ù ÙÙÛâÚ©ÙÙ Ø±Ø§ Ø¨Ø§ Jabber/Gtalk Ø¨Ø±Ø§ÛÙ Ø§Ø±Ø³Ø§Ù Ú©Ù."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ÛÚ© Ø´ÙØ§Ø³ÙâÛ Ú©ÙÚÚ© Ø¨Ø±Ø§Û Jabber/Gtalk ÙÙ ÙÙØªØ´Ø± Ú©Ù."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "ØªÙØ¸ÛÙØ§Øª Ø°Ø®ÛØ±Ù Ø´Ø¯."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "ÙÛÚ Ø´ÙØ§Ø³ÙÙ Jabber Ø§Û ÙØ¬ÙØ¯ ÙØ¯Ø§Ø±Ø¯."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÙÙÛâØªÙØ§Ù Ø´ÙØ§Ø³ÙâÛ Jabber Ø±Ø§ ØªØ§ÛÛØ¯ Ú©Ø±Ø¯"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Ø´ÙØ§Ø³ÙâÛ Jabber Ø¯Ø±Ø³Øª ÙÛØ³Øª"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Ø§ÛÙ Ø´ÙØ§Ø³Ù Jabber Ú©ÙÙÙÛ Ø´ÙØ§Ø³Øª."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Ø´ÙØ§Ø³Ù Jabber Ø¨Ù ÛÚ© Ú©Ø§Ø±Ø¨Ø± Ø¯ÛÚ¯Ø± ÙØ±Ø¨ÙØ· Ø§Ø³Øª."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1951,10 +2082,35 @@ msgstr ""
 "Ú©Ø¯ ØªØ§ÛÛØ¯ Ø¨Ù Ù¾ÛØ§ÙâØ±Ø³Ø§Ù Ø´ÙØ§ Ø§Ø±Ø³Ø§Ù Ø´Ø¯. Ø´ÙØ§ Ø¨Ø§ÛØ¯ %s Ø±Ø§ ØªØ§ÛÛØ¯ Ú©ÙÛØ¯ ØªØ§ Ù¾ÛØ§ÙâÙØ§ Ø¨Ù "
 "Ø´ÙØ§ Ø§Ø±Ø³Ø§Ù Ø´ÙØ¯."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "ÙØ´Ø§ÙÛ Ù¾ÛØ§Ù Ø±Ø³Ø§Ù Ø§Ø´ØªØ¨Ø§Ù Ø§Ø³Øª."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ÙÙÛâØªÙØ§Ù ØªØµØ¯ÛÙ Ù¾Ø³Øª Ø§ÙÚ©ØªØ±ÙÙÛÚ© Ø±Ø§ Ù¾Ø§Ú© Ú©Ø±Ø¯."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "ØªØ§ÛÛØ¯ ÙØ³Ø® Ø´Ø¯."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Ø§ÛÙ Ø´ÙØ§Ø³ÙâÛ Jabber Ø´ÙØ§ ÙÛØ³Øª."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "ÙØ´Ø§ÙÛ Ù¾Ø§Ú© Ø´Ø¯Ù Ø§Ø³Øª."
+
 #: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1995,7 +2151,9 @@ msgstr "Ø¯Ø¹ÙØª Ú©Ø±Ø¯Ù Ú©Ø§Ø±Ø¨Ø±Ø§Ù ØªØ§Ø²Ù"
 msgid "You are already subscribed to these users:"
 msgstr "ÙÙ Ø§Ú©ÙÙÙ Ø´ÙØ§ Ø§ÛÙ Ú©Ø§Ø±Ø¨Ø±Ø§Ù Ø±Ø§ Ø¯ÙØ¨Ø§Ù ÙÛâÚ©ÙÛØ¯: "
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2093,7 +2251,9 @@ msgstr "Ø¨Ø±Ø§Û Ù¾ÛÙØ³ØªÙ Ø¨Ù ÛÚ© Ú¯Ø±ÙÙØ Ø¨Ø§ÛØ¯ ÙØ§Ø±Ø¯ Ø´Ø¯Ù Ø¨Ø§
 msgid "No nickname or ID."
 msgstr "Ø¨Ø¯ÙÙ ÙÙØ¨."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, fuzzy, php-format
 msgid "%1$s joined group %2$s"
 msgstr "ÙÙØÙ Ø´Ø¯Ù Ø¨Ù Ú¯Ø±ÙÙ"
@@ -2102,11 +2262,13 @@ msgstr "ÙÙØÙ Ø´Ø¯Ù Ø¨Ù Ú¯Ø±ÙÙ"
 msgid "You must be logged in to leave a group."
 msgstr "Ø¨Ø±Ø§Û ØªØ±Ú© ÛÚ© Ú¯Ø±ÙÙØ Ø´ÙØ§ Ø¨Ø§ÛØ¯ ÙØ§Ø±Ø¯ Ø´Ø¯Ù Ø¨Ø§Ø´ÛØ¯."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "Ø´ÙØ§ ÛÚ© Ú©Ø§Ø±Ø¨Ø± Ø§ÛÙ Ú¯Ø±ÙÙ ÙÛØ³ØªÛØ¯."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%s Ú¯Ø±ÙÙ %s Ø±Ø§ ØªØ±Ú© Ú©Ø±Ø¯."
@@ -2220,12 +2382,12 @@ msgstr "Ø§Ø² Ø§ÛÙ ÙØ±Ù Ø¨Ø±Ø§Û Ø³Ø§Ø®ØªÙ ÛÚ© Ú¯Ø±ÙÙ Ø¬Ø¯ÛØ¯ Ø§Ø³ØªÙØ§
 msgid "New message"
 msgstr "Ù¾ÛØ§Ù Ø¬Ø¯ÛØ¯"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Ø´ÙØ§ ÙÙÛ ØªÙØ§ÙÛØ¯ Ø¨Ù Ø§ÛÙ Ú©Ø§Ø±Ø¨Ø± Ù¾ÛØ§Ù Ø¨ÙØ±Ø³ØªÛØ¯."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Ø¨Ø¯ÙÙ ÙØØªÙØ§!"
 
@@ -2233,7 +2395,7 @@ msgstr "Ø¨Ø¯ÙÙ ÙØØªÙØ§!"
 msgid "No recipient specified."
 msgstr "ÙÛÚ Ú¯ÛØ±ÙØ¯Ù Ø§Û ÙØ´Ø®Øµ ÙØ´Ø¯Ù"
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "ÛÚ© Ù¾ÛØ§Ù Ø±Ø§ Ø¨Ù Ø®ÙØ¯ØªØ§Ù ÙÙØ±Ø³ØªÛØ¯Ø Ø¯Ø± Ø¹ÙØ¶ Ø¢Ù Ø±Ø§ Ø¢ÙØ³ØªÙ Ø¨Ø±Ø§Û Ø®ÙØ¯ Ø¨Ú¯ÙÛÛØ¯."
@@ -2499,7 +2661,7 @@ msgid "6 or more characters"
 msgstr "Û¶ ÙÙÛØ³Ù ÛØ§ Ø¨ÛØ´âØªØ±"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "ØªØ§ÛÛØ¯"
 
@@ -3833,68 +3995,109 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Ø®Ø¨Ø± Ø³Ø§ÛØª"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "ØªÙØ¸ÛÙØ§Øª Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ÙÙØ±Û"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr ""
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "ÙØ´Ø§ÙÛ Ù¾ÛØ§ÙâØ±Ø³Ø§Ù ÙÙØ±Û"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "ÙÙØªØ¸Ø± ØªØ§ÛÛØ¯ÛÙ Ø¨Ø±Ø§Û Ø§ÛÙ Ø´ÙØ§Ø±Ù ØªÙÙÙ."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Ú©Ø¯ ØªØ§ÛÛØ¯ÛÙ"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Ú©Ø¯Û Ø±Ø§ Ú©Ù Ø¯Ø± Ú¯ÙØ´ÛØªØ§Ù Ú¯Ø±ÙØªÛØ¯ ÙØ§Ø±Ø¯ Ú©ÙÛØ¯."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "ØªØ§ÛÛØ¯"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 #, fuzzy
 msgid "SMS phone number"
 msgstr "Ø´ÙØ§Ø±Ù ØªÙØ§Ø³ Ù¾ÛØ§ÙÚ©"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Ø´ÙØ§Ø±Ù ØªÙÙÙØ Ø¨Ø¯ÙÙ ÙØ´Ø§ÙÙ Ú¯Ø°Ø§Ø±Û ÛØ§ ÙØ§ØµÙÙØ Ø¨Ø§ Ú©Ø¯ ÙÙØ·ÙÙ"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "ØªØ±Ø¬ÛØØ§Øª"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "ØªÙØ¸ÛÙØ§Øª Ø°Ø®ÛØ±Ù Ø´Ø¯."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Ø¨Ø¯ÙÙ Ø´ÙØ§Ø±Ù ØªÙÙÙ."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Ø¢Ù ÙØ¨ÙØ§ Ø´ÙØ§Ø±Ù ØªÙÙÙ Ø´ÙØ§ Ø¨ÙØ¯Ù Ø§Ø³Øª."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Ø£Ù Ø´ÙØ§Ø±Ù ØªÙÙÙ Ù¾ÛØ´ Ø§Ø² Ø§ÛÙ Ø¨Ù Ú©Ø§Ø±Ø¨Ø± Ø¯ÛÚ¯Ø±Û ØªØ¹ÙÙ Ø¯Ø§Ø´ØªÙ Ø§Ø³Øª."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -3902,30 +4105,50 @@ msgstr ""
 "ÛÚ© Ú©Ø¯ ØªØ§ÛÛØ¯ÛÙ Ø¨Ù Ø´ÙØ§Ø±Ù ØªÙÙÙÛ Ú©Ù Ø´ÙØ§ ÙØ§Ø±Ø¯ Ú©Ø±Ø¯ÛØ¯ Ø§Ø±Ø³Ø§Ù Ø´Ø¯. Ú¯ÙØ´ÛØªØ§Ù Ø±Ø§ Ø¨Ø±Ø±Ø³Û "
 "Ú©ÙÛØ¯ Ø¨Ø±Ø§Û Ú©Ø¯ Ù Ø¯Ø³ØªÙØ±Ø§ÙØ¹ÙÙ ÚÚ¯ÙÙÚ¯Û Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² Ø¢Ù."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Ø¢Ù Ú©Ø¯ ØªØ§ÛÛØ¯ÛÙ Û ÙØ§Ø¯Ø±Ø³Øª Ø§Ø³Øª."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "ØªØ§ÛÛØ¯ ÙØ³Ø® Ø´Ø¯."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Ø¢Ù Ø´ÙØ§Ø±Ù ØªÙÙÙ Ø´ÙØ§ ÙÛØ³Øª."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Ø´ÙØ§Ø±Ù ØªÙØ§Ø³ Ù¾ÛØ§ÙÚ©"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Ø§ÙÙØ§Ø¬ ÙÙØ¨Ø§ÛÙ"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Ú©Ø¯Û ÙØ§Ø±Ø¯ ÙØ´Ø¯"
 
@@ -5108,10 +5331,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Ø§ÙØµØ±Ø§Ù"
 
@@ -5187,34 +5408,40 @@ msgstr "ÙØ±ÙØ§Ù Ø´Ú©Ø³Øª Ø®ÙØ±Ø¯"
 msgid "Notice with that id does not exist"
 msgstr "Ø®Ø¨Ø±Û Ø¨Ø§ Ø§ÛÙ ÙØ´Ø®ØµÙ Ø§ÛØ¬Ø§Ø¯ ÙØ´Ø¯"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "Ú©Ø§Ø±Ø¨Ø± Ø¢Ú¯ÙÛ Ø¢Ø®Ø± ÙØ¯Ø§Ø±Ø¯"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Ù¾ÛØ¯Ø§ ÙØ´Ø¯ %s Ú©Ø§Ø±ÛØ±Û ÛØ§ ÙØ§Ù ÙØ³ØªØ¹Ø§Ø±"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Ù¾ÛØ¯Ø§ ÙØ´Ø¯ %s Ú©Ø§Ø±ÛØ±Û ÛØ§ ÙØ§Ù ÙØ³ØªØ¹Ø§Ø±"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "ÙØªØ§Ø³ÙØ§ÙÙ Ø§ÛÙ Ø¯Ø³ØªÙØ± ÙÙÙØ² Ø§Ø¬Ø±Ø§ ÙØ´Ø¯Ù."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "ÙØ±ØªØ§Ø¯Ù Ø§ÚÛØ±"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5225,197 +5452,201 @@ msgstr ""
 "ÙØ´ØªØ±Ú© : %2$s\n"
 "Ø®Ø¨Ø± : %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Ø´ÙØ§ Ø§Ø² Ù¾ÛØ´ ÛÚ© Ø¹Ø¶Ù Ø§ÛÙ Ú¯Ø±ÙÙ ÙØ³ØªÛØ¯."
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
 msgstr "Ø¹Ø¶ÙÛØª %s Ø¯Ø± Ú¯Ø±ÙÙ %s ÙØ§ ÙÙÙÙ Ø¨ÙØ¯."
 
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "ÙÙØÙ Ø´Ø¯Ù Ø¨Ù Ú¯Ø±ÙÙ"
-
-#: lib/command.php:373
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
 #, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
 msgstr "Ø®Ø§Ø±Ø¬ Ø´Ø¯Ù %s Ø§Ø² Ú¯Ø±ÙÙ %s ÙØ§ ÙÙÙÙ Ø¨ÙØ¯"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s Ú¯Ø±ÙÙ %s Ø±Ø§ ØªØ±Ú© Ú©Ø±Ø¯."
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "ÙØ§Ù Ú©Ø§ÙÙ : %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "ÙÙÙØ¹ÛØª : %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "ØµÙØÙ Ø®Ø§ÙÚ¯Û : %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Ø¯Ø±Ø¨Ø§Ø±Ù Û : %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 "Ù¾ÛØºØ§Ù Ø¨Ø³ÛØ§Ø± Ø·ÙÙØ§ÙÛ Ø§Ø³Øª - Ø¨ÛØ´ØªØ±ÛÙ Ø§ÙØ¯Ø§Ø²Ù Ø§ÙÚ©Ø§Ù Ù¾Ø°ÛØ± %d Ú©Ø§Ø±Ø§Ú©ØªØ± Ø§Ø³Øª , Ø´ÙØ§ %d "
 "ØªØ§ ÙØ±Ø³ØªØ§Ø¯ÛØ¯"
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Ù¾ÛØ§Ù ÙØ³ØªÙÛÙ Ø¨Ù %s ÙØ±Ø³ØªØ§Ø¯Ù Ø´Ø¯."
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Ø®Ø·Ø§ Ø¯Ø± ÙØ±Ø³ØªØ§Ø¯Ù Ù¾ÛØ§Ù ÙØ³ØªÙÛÙ."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "ÙÙÛ ØªÙØ§Ù Ø¢Ú¯ÙÛ Ø®ÙØ¯ØªØ§Ù Ø±Ø§ ØªÚ©Ø±Ø§Ø± Ú©Ø±Ø¯"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "Ø¢Ù Ø¢Ú¯ÙÛ ÙØ¨ÙØ§ ØªÚ©Ø±Ø§Ø± Ø´Ø¯Ù Ø§Ø³Øª."
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "Ø¢Ú¯ÙÛ ØªÚ©Ø±Ø§Ø± Ø´Ø¯"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Ø®Ø·Ø§ ÙÙÚ¯Ø§Ù ØªÚ©Ø±Ø§Ø± Ø¢Ú¯ÙÛ."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 "Ù¾ÛØºØ§Ù Ø¨Ø³ÛØ§Ø± Ø·ÙÙØ§ÙÛ Ø§Ø³Øª - Ø¨ÛØ´ØªØ±ÛÙ Ø§ÙØ¯Ø§Ø²Ù Ø§ÙÚ©Ø§Ù Ù¾Ø°ÛØ± %d Ú©Ø§Ø±Ø§Ú©ØªØ± Ø§Ø³Øª , Ø´ÙØ§ %d "
 "ØªØ§ ÙØ±Ø³ØªØ§Ø¯ÛØ¯"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Ø¨Ù Ø§ÛÙ Ø¢Ú¯ÙÛ Ø¬ÙØ§Ø¨ Ø¯ÙÛØ¯"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Ø®Ø·Ø§ ÙÙÚ¯Ø§Ù Ø°Ø®ÛØ±Ù Û Ø¢Ú¯ÙÛ"
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Ø´ÙØ§ Ø¨Ù Ø§ÛÙ Ù¾Ø±ÙÙÙÙ ÙØªØ¹ÙØ¯ ÙØ´Ø¯ÛØ¯"
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Ø¯Ø³ØªÙØ± ÙÙÙØ² Ø§Ø¬Ø±Ø§ ÙØ´Ø¯Ù"
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "ÙØ§ØªÙØ§Ù Ø¯Ø± Ø®Ø§ÙÙØ´ Ú©Ø±Ø¯Ù Ø¢Ú¯Ø§Ù Ø³Ø§Ø²Û."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Ø¢Ú¯Ø§Ù Ø³Ø§Ø²Û ÙØ¹Ø§Ù Ø§Ø³Øª."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "ÙØ§ØªÙØ§Ù Ø¯Ø± Ø±ÙØ´Ù Ú©Ø±Ø¯Ù Ø¢Ú¯Ø§Ù Ø³Ø§Ø²Û."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "ÙØ±ÙØ§Ù ÙØ±ÙØ¯ Ø§Ø² Ú©Ø§Ø± Ø§ÙØªØ§Ø¯Ù Ø§Ø³Øª"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "ÙØ´ØªØ±Ú©âÙØ§"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "Ø´ÙØ§ ØªÙØ³Ø· ÙÛÚ Ú©Ø³ ØªØµÙÛØ¨ ÙØ´Ø¯Ù Ø§ÛØ¯ ."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ÙÙ Ø§Ú©ÙÙÙ Ø´ÙØ§ Ø§ÛÙ Ú©Ø§Ø±Ø¨Ø±Ø§Ù Ø±Ø§ Ø¯ÙØ¨Ø§Ù ÙÛâÚ©ÙÛØ¯: "
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "ÙÛÚÚ©Ø³ Ø´ÙØ§ Ø±Ø§ ØªØ§ÛÛØ¯ ÙÚ©Ø±Ø¯Ù ."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "ÙÛÚÚ©Ø³ Ø´ÙØ§ Ø±Ø§ ØªØ§ÛÛØ¯ ÙÚ©Ø±Ø¯Ù ."
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "Ø´ÙØ§ Ø¯Ø± ÙÛÚ Ú¯Ø±ÙÙÛ Ø¹Ø¶Ù ÙÛØ³ØªÛØ¯ ."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ø´ÙØ§ ÛÚ© Ø¹Ø¶Ù Ø§ÛÙ Ú¯Ø±ÙÙ ÙÛØ³ØªÛØ¯."
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6250,6 +6481,10 @@ msgstr ""
 msgid "Repeat this notice?"
 msgstr "Ø¨Ù Ø§ÛÙ Ø¢Ú¯ÙÛ Ø¬ÙØ§Ø¨ Ø¯ÙÛØ¯"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ø¨ÙÙ"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr ""
@@ -6437,47 +6672,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "ÚÙØ¯ Ø«Ø§ÙÛÙ Ù¾ÛØ´"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "ØØ¯ÙØ¯ ÛÚ© Ø¯ÙÛÙÙ Ù¾ÛØ´"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "ØØ¯ÙØ¯ %d Ø¯ÙÛÙÙ Ù¾ÛØ´"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "ØØ¯ÙØ¯ ÛÚ© Ø³Ø§Ø¹Øª Ù¾ÛØ´"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "ØØ¯ÙØ¯ %d Ø³Ø§Ø¹Øª Ù¾ÛØ´"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "ØØ¯ÙØ¯ ÛÚ© Ø±ÙØ² Ù¾ÛØ´"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "ØØ¯ÙØ¯ %d Ø±ÙØ² Ù¾ÛØ´"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "ØØ¯ÙØ¯ ÛÚ© ÙØ§Ù Ù¾ÛØ´"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "ØØ¯ÙØ¯ %d ÙØ§Ù Ù¾ÛØ´"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "ØØ¯ÙØ¯ ÛÚ© Ø³Ø§Ù Ù¾ÛØ´"
 
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 0b36994205..c016316071 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:48+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:36+0000\n"
 "Language-Team: Finnish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: out-statusnet\n"
@@ -80,8 +80,13 @@ msgstr "EstÃ¤"
 msgid "Save access settings"
 msgstr "Profiilikuva-asetukset"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -113,7 +118,7 @@ msgstr "Sivua ei ole."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "KÃ¤yttÃ¤jÃ¤Ã¤ ei ole."
@@ -356,7 +361,7 @@ msgstr "KÃ¤yttÃ¤jÃ¤tunnukselle ei lÃ¶ytynyt statusviestiÃ¤."
 msgid "This status is already a favorite."
 msgstr "TÃ¤mÃ¤ pÃ¤ivitys on jo suosikki!"
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Ei voitu lisÃ¤tÃ¤ suosikiksi."
 
@@ -479,7 +484,7 @@ msgstr "RyhmÃ¤Ã¤ ei lÃ¶ytynyt!"
 msgid "You are already a member of that group."
 msgstr "SinÃ¤ kuulut jo tÃ¤hÃ¤n ryhmÃ¤Ã¤n."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "Sinut on estetty osallistumasta tÃ¤hÃ¤n ryhmÃ¤Ã¤n yllÃ¤pitÃ¤jÃ¤n toimesta."
 
@@ -531,17 +536,17 @@ msgid "Invalid token."
 msgstr "Koko ei kelpaa."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -577,12 +582,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Odottamaton lomakkeen lÃ¤hetys."
 
@@ -842,27 +850,44 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Ei"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "ÃlÃ¤ estÃ¤ tÃ¤tÃ¤ kÃ¤yttÃ¤jÃ¤Ã¤"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "KyllÃ¤"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "EstÃ¤ tÃ¤mÃ¤ kÃ¤yttÃ¤jÃ¤"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "KÃ¤yttÃ¤jÃ¤n estotiedon tallennus epÃ¤onnistui."
 
@@ -875,8 +900,8 @@ msgstr "KÃ¤yttÃ¤jÃ¤n estotiedon tallennus epÃ¤onnistui."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Tuota ryhmÃ¤Ã¤ ei ole."
 
@@ -935,16 +960,24 @@ msgstr "Tuntematon osoitetyyppi %s "
 msgid "That address has already been confirmed."
 msgstr "TÃ¤mÃ¤ osoite on jo vahvistettu."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Ei voitu pÃ¤ivittÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤Ã¤."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Ei voitu poistaa sÃ¤hkÃ¶postivahvistusta."
 
@@ -1002,12 +1035,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "ÃlÃ¤ poista tÃ¤tÃ¤ pÃ¤ivitystÃ¤"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "Poista tÃ¤mÃ¤ pÃ¤ivitys"
@@ -1043,11 +1078,13 @@ msgstr "Poista pÃ¤ivitys"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Oletko varma ettÃ¤ haluat poistaa tÃ¤mÃ¤n pÃ¤ivityksen?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "ÃlÃ¤ poista tÃ¤tÃ¤ pÃ¤ivitystÃ¤"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Poista tÃ¤mÃ¤ pÃ¤ivitys"
 
@@ -1070,7 +1107,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 #, fuzzy
 msgid "Delete this user"
 msgstr "Poista tÃ¤mÃ¤ pÃ¤ivitys"
@@ -1189,15 +1227,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Tallenna"
 
@@ -1336,32 +1372,45 @@ msgstr "Ei voitu lisÃ¤tÃ¤ aliasta."
 msgid "Options saved."
 msgstr "Asetukset tallennettu."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "SÃ¤hkÃ¶postiasetukset"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "MÃ¤Ã¤ritÃ¤ miten saat sÃ¤hkÃ¶postin palvelusta %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Osoite"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "SÃ¤hkÃ¶postiosoitteet"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "TÃ¤mÃ¤n hetken vahvistettu sÃ¤hkÃ¶postiosoite."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Poista"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1370,109 +1419,143 @@ msgstr ""
 "sÃ¤hkÃ¶postilaatikostasi (ja roskapostikansiosta!) viesti, jossa on "
 "lisÃ¤ohjeita. "
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "SÃ¤hkÃ¶postiosoitteet"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "SÃ¤hkÃ¶postiosoite, esimerkiksi \"kÃ¤yttÃ¤jÃ¤tunnus@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "LisÃ¤Ã¤"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Saapuva sÃ¤hkÃ¶posti"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia tÃ¤hÃ¤n osoitteeseen tehdÃ¤ksesi pÃ¤ivityksiÃ¤."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Tee uusi sÃ¤hkÃ¶postiosoite johon lÃ¤hettÃ¤Ã¤ pÃ¤ivityksiÃ¤; tÃ¤mÃ¤ poistaa vanhan "
 "osoitteen"
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Uusi"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Asetukset"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postilla tieto uusista tilaajista."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia, jos joku lisÃ¤Ã¤ pÃ¤ivitykseni suosikiksi."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia, jos joku lÃ¤hettÃ¤Ã¤ minulle yksityisviestin."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "LÃ¤hetÃ¤ sÃ¤hkÃ¶postia, jos joku lÃ¤hettÃ¤Ã¤ minulle \"@-vastauksen\"."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Salli kavereiden tÃ¶nÃ¤istÃ¤ minua ja lÃ¤hetÃ¤ sÃ¤hkÃ¶postilla ilmoitus."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Haluan lÃ¤hettÃ¤Ã¤ pÃ¤ivityksiÃ¤ sÃ¤hkÃ¶postilla."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Julkaise MicroID sÃ¤hkÃ¶postiosoitteelleni."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Asetukset tallennettu."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Ulkoasuasetukset tallennettu."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "SÃ¤hkÃ¶postiosoitetta ei ole."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Ei voida normalisoida sÃ¤hkÃ¶postiosoitetta"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Tuo ei ole kelvollinen sÃ¤hkÃ¶postiosoite."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "TÃ¤mÃ¤ on jo sÃ¤hkÃ¶postiosoitteesi."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "TÃ¤mÃ¤ sÃ¤hkÃ¶postiosoite kuuluu jo toisella kÃ¤yttÃ¤jÃ¤llÃ¤."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Ei voitu asettaa vahvistuskoodia."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1481,43 +1564,56 @@ msgstr ""
 "sÃ¤hkÃ¶postilaatikostasi (ja roskapostilaatikostasi!) vahvistuskoodisi ja "
 "miten sitÃ¤ kÃ¤ytetÃ¤Ã¤n. "
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "TÃ¤mÃ¤ on vÃ¤Ã¤rÃ¤ pikaviestiosoite."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Vahvistus peruttu."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "TÃ¤mÃ¤ ei ole sÃ¤hkÃ¶postiosoitteesi."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Osoite on poistettu."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Saapuvan sÃ¤hkÃ¶postin osoitetta ei ole."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Ei voitu pÃ¤ivittÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤tietoja."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Saapuvan sÃ¤hkÃ¶postin osoite poistettu."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Uusi saapuvan sÃ¤hkÃ¶postin osoite lisÃ¤tty."
 
@@ -1711,15 +1807,17 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "ÃlÃ¤ estÃ¤ tÃ¤tÃ¤ kÃ¤yttÃ¤jÃ¤Ã¤ tÃ¤stÃ¤ ryhmÃ¤stÃ¤"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "EstÃ¤ tÃ¤tÃ¤ kÃ¤yttÃ¤jÃ¤Ã¤ osallistumassa tÃ¤hÃ¤n ryhmÃ¤Ã¤n"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1892,12 +1990,16 @@ msgstr "KÃ¤yttÃ¤jÃ¤Ã¤ ei ole estetty ryhmÃ¤stÃ¤."
 msgid "Error removing the block."
 msgstr "Tapahtui virhe, kun estoa poistettiin."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "Pikaviestiasetukset"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1906,15 +2008,25 @@ msgstr ""
 "Voit lÃ¤hettÃ¤Ã¤ ja vastaanottaa pÃ¤ivityksiÃ¤ Jabber/GTalk-[pikaviestintÃ¤](%%doc."
 "im%%) kÃ¤yttÃ¤en. Alla voit mÃ¤Ã¤rittÃ¤Ã¤ osoitteesi ja asetuksesi. "
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "Pikaviestin ei ole kÃ¤ytettÃ¤vissÃ¤."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "Pikaviestiosoite"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "TÃ¤mÃ¤n hetken vahvistettu Jabber/GTalk -osoite."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1924,12 +2036,9 @@ msgstr ""
 "kÃ¤yttÃ¤jÃ¤tililtÃ¤si viesti, jossa on lisÃ¤ohjeet. (LisÃ¤sitkÃ¶ %s:n "
 "ystÃ¤vÃ¤listaasi?)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "Pikaviestiosoite"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1939,45 +2048,67 @@ msgstr ""
 "Varmista ettÃ¤ olet lisÃ¤nnyt %s kaverilistaasi pikaviestiohjelmassasi tai "
 "GTalkissa."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Asetukset"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "LÃ¤hetÃ¤ minulle pÃ¤ivityksiÃ¤ Jabberilla/GTalkilla."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "LÃ¤hetÃ¤ pÃ¤ivitys kun Jabber/GTalk -tilatietoni vaihtuu."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "LÃ¤hetÃ¤ Jabberilla/GTalkilla sellaistenkin ihmisten vastaukset, joita en ole "
 "tilannut. "
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Julkaise MicroID Jabber/GTalk-osoitteelleni."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Asetukset tallennettu."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Ei Jabber ID -osoitetta"
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Ei voida normalisoida Jabber ID -tunnusta"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Tuo ei ole kelvollinen Jabber ID."
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "TÃ¤mÃ¤ on jo Jabber ID -tunnuksesi."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID kuuluu jo toiselle kÃ¤yttÃ¤jÃ¤lle."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1986,10 +2117,35 @@ msgstr ""
 "Vahvistuskoodi lÃ¤hetettiin antamaasi pikaviestinosoitteeseen. Sinun tÃ¤ytyy "
 "antaa osoitteelle %s oikeus lÃ¤hettÃ¤Ã¤ viestejÃ¤ sinulle."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "TÃ¤mÃ¤ on vÃ¤Ã¤rÃ¤ pikaviestiosoite."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Ei voitu poistaa sÃ¤hkÃ¶postivahvistusta."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Vahvistus peruttu."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "TÃ¤mÃ¤ ei ole Jabber ID-tunnuksesi."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Osoite on poistettu."
+
 #: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2032,7 +2188,9 @@ msgstr "Kutsu uusia kÃ¤yttÃ¤jiÃ¤"
 msgid "You are already subscribed to these users:"
 msgstr "Olet jos tilannut seuraavien kÃ¤yttÃ¤jien pÃ¤ivitykset:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2158,7 +2316,9 @@ msgstr "Sinun pitÃ¤Ã¤ olla kirjautunut sisÃ¤Ã¤n, jos haluat liittyÃ¤ ryhmÃ¤Ã¤n."
 msgid "No nickname or ID."
 msgstr "Tunnusta ei ole."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, fuzzy, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%s liittyi ryhmÃ¤Ã¤n %s"
@@ -2167,11 +2327,13 @@ msgstr "%s liittyi ryhmÃ¤Ã¤n %s"
 msgid "You must be logged in to leave a group."
 msgstr "Sinun pitÃ¤Ã¤ olla kirjautunut sisÃ¤Ã¤n, jotta voit erota ryhmÃ¤stÃ¤."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "SinÃ¤ et kuulu tÃ¤hÃ¤n ryhmÃ¤Ã¤n."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%s erosi ryhmÃ¤stÃ¤ %s"
@@ -2289,12 +2451,12 @@ msgstr "KÃ¤ytÃ¤ tÃ¤tÃ¤ lomaketta luodaksesi ryhmÃ¤n."
 msgid "New message"
 msgstr "Uusi viesti"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Et voi lÃ¤hettÃ¤Ã¤ viestiÃ¤ tÃ¤lle kÃ¤yttÃ¤jÃ¤lle."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Ei sisÃ¤ltÃ¶Ã¤!"
 
@@ -2302,7 +2464,7 @@ msgstr "Ei sisÃ¤ltÃ¶Ã¤!"
 msgid "No recipient specified."
 msgstr "Vastaanottajaa ei ole mÃ¤Ã¤ritelty."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "ÃlÃ¤ lÃ¤hetÃ¤ viestiÃ¤ itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
@@ -2567,7 +2729,7 @@ msgid "6 or more characters"
 msgstr "6 tai useampia merkkejÃ¤"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Vahvista"
 
@@ -3968,47 +4130,77 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Palvelun ilmoitus"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "SMS-asetukset"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Voit saada SMS viestit sÃ¤hkÃ¶postin vÃ¤lityksellÃ¤ %%site.name%% -palvelusta."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "SMS ei ole kÃ¤ytettÃ¤vissÃ¤."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Pikaviestiosoite"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "TÃ¤mÃ¤n hetken vahvistettu SMS puhelinnumero."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Odotetaan vahvistusta tÃ¤lle puhelinnumerolle."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Vahvistuskoodi"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "SyÃ¶tÃ¤ koodi jonka sait puhelimeesi."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Vahvista"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 #, fuzzy
 msgid "SMS phone number"
 msgstr "SMS puhelinnumero"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Puhelinnumero, ei vÃ¤limerkkejÃ¤ tai vÃ¤lilyÃ¶ntejÃ¤, suuntanumerollinen"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Asetukset"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -4016,23 +4208,34 @@ msgstr ""
 "LÃ¤hetÃ¤ pÃ¤ivityksiÃ¤ SMS:llÃ¤; YmmÃ¤rrÃ¤n, ettÃ¤ voin saada kohtuuttomia laskuja "
 "tÃ¤stÃ¤ matkapuhelinoperaattoriltani."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Asetukset tallennettu."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Puhelinnumeroa ei ole."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Operaattoria ei ole valittu."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "TÃ¤mÃ¤ on jo puhelinnumerosi."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "TÃ¤mÃ¤ puhelinnumero kuuluu jo toiselle kÃ¤yttÃ¤jÃ¤lle."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -4040,23 +4243,42 @@ msgstr ""
 "Vahvistuskoodi on lÃ¤hetetty puhelinnumeroosi. Katso tekstiviesteistÃ¤si "
 "vahvistuskoodisi ja ohjeet miten sitÃ¤ kÃ¤ytetÃ¤Ã¤n."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "TÃ¤mÃ¤ on vÃ¤Ã¤rÃ¤ vahvistukoodi."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Vahvistus peruttu."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "TÃ¤mÃ¤ ei ole puhelinnumerosi."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS puhelinnumero"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Matkapuhelinoperaattori"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Valitse operaattori"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4066,7 +4288,8 @@ msgstr ""
 "viestilÃ¤hetyksiÃ¤ sÃ¤hkÃ¶postilla, mutta ei ole listattu tÃ¤nne, lÃ¤hetÃ¤ "
 "sÃ¤hkÃ¶postia meille osoitteeseen %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Koodia ei ole syÃ¶tetty."
 
@@ -5304,10 +5527,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Peruuta"
 
@@ -5385,34 +5606,40 @@ msgstr "Komento epÃ¤onnistui"
 msgid "Notice with that id does not exist"
 msgstr "Ei profiilia tuolla id:llÃ¤."
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "KÃ¤yttÃ¤jÃ¤llÃ¤ ei ole viimeistÃ¤ pÃ¤ivitystÃ¤"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Ei voitu pÃ¤ivittÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤lle vahvistettua sÃ¤hkÃ¶postiosoitetta."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Ei voitu pÃ¤ivittÃ¤Ã¤ kÃ¤yttÃ¤jÃ¤lle vahvistettua sÃ¤hkÃ¶postiosoitetta."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Valitettavasti tÃ¤tÃ¤ komentoa  ei ole vielÃ¤ toteutettu."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "TÃ¶nÃ¤isy lÃ¤hetetty"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5420,203 +5647,207 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "PÃ¤ivitys on merkitty suosikiksi."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "SinÃ¤ kuulut jo tÃ¤hÃ¤n ryhmÃ¤Ã¤n."
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
 msgstr "KÃ¤yttÃ¤jÃ¤ %s ei voinut liittyÃ¤ ryhmÃ¤Ã¤n %s."
 
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s liittyi ryhmÃ¤Ã¤n %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "Ei voitu poistaa kÃ¤yttÃ¤jÃ¤Ã¤ %s ryhmÃ¤stÃ¤ %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s erosi ryhmÃ¤stÃ¤ %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Koko nimi: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Kotipaikka: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Kotisivu: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Tietoa: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr "Viesti oli liian pitkÃ¤ - maksimikoko on 140 merkkiÃ¤, lÃ¤hetit %d"
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Suora viesti kÃ¤yttÃ¤jÃ¤lle %s lÃ¤hetetty"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Tapahtui virhe suoran viestin lÃ¤hetyksessÃ¤."
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "Ilmoituksia ei voi pistÃ¤Ã¤ pÃ¤Ã¤lle."
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "Poista tÃ¤mÃ¤ pÃ¤ivitys"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "PÃ¤ivitys lÃ¤hetetty"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "Ongelma pÃ¤ivityksen tallentamisessa."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Viesti oli liian pitkÃ¤ - maksimikoko on 140 merkkiÃ¤, lÃ¤hetit %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Vastaa tÃ¤hÃ¤n pÃ¤ivitykseen"
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Ongelma pÃ¤ivityksen tallentamisessa."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Anna kÃ¤yttÃ¤jÃ¤tunnus, jonka pÃ¤ivitykset haluat tilata"
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Et ole tilannut tÃ¤mÃ¤n kÃ¤yttÃ¤jÃ¤n pÃ¤ivityksiÃ¤."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "KÃ¤yttÃ¤jÃ¤n %s pÃ¤ivitykset tilattu"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Anna kÃ¤yttÃ¤jÃ¤tunnus, jonka pÃ¤ivityksien tilauksen haluat lopettaa"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "KÃ¤yttÃ¤jÃ¤n %s pÃ¤ivitysten tilaus lopetettu"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Komentoa ei ole vielÃ¤ toteutettu."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Ilmoitukset pois pÃ¤Ã¤ltÃ¤."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "Ilmoituksia ei voi pistÃ¤Ã¤ pois pÃ¤Ã¤ltÃ¤."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Ilmoitukset pÃ¤Ã¤llÃ¤."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Ilmoituksia ei voi pistÃ¤Ã¤ pÃ¤Ã¤lle."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "KÃ¤yttÃ¤jÃ¤n %s pÃ¤ivitysten tilaus lopetettu"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Et ole tilannut tÃ¤mÃ¤n kÃ¤yttÃ¤jÃ¤n pÃ¤ivityksiÃ¤."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Olet jos tilannut seuraavien kÃ¤yttÃ¤jien pÃ¤ivitykset:"
 msgstr[1] "Olet jos tilannut seuraavien kÃ¤yttÃ¤jien pÃ¤ivitykset:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Toista ei voitu asettaa tilaamaan sinua."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Toista ei voitu asettaa tilaamaan sinua."
 msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "SinÃ¤ et kuulu tÃ¤hÃ¤n ryhmÃ¤Ã¤n."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "SinÃ¤ et kuulu tÃ¤hÃ¤n ryhmÃ¤Ã¤n."
 msgstr[1] "SinÃ¤ et kuulu tÃ¤hÃ¤n ryhmÃ¤Ã¤n."
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6481,6 +6712,10 @@ msgstr "Ei id parametria."
 msgid "Repeat this notice?"
 msgstr "Vastaa tÃ¤hÃ¤n pÃ¤ivitykseen"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "KyllÃ¤"
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6680,47 +6915,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "muutama sekunti sitten"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "noin minuutti sitten"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "noin %d minuuttia sitten"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "noin tunti sitten"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "noin %d tuntia sitten"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "noin pÃ¤ivÃ¤ sitten"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "noin %d pÃ¤ivÃ¤Ã¤ sitten"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "noin kuukausi sitten"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "noin %d kuukautta sitten"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "noin vuosi sitten"
 
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 0e0fc639a6..1aafddc3ad 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -14,12 +14,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:35:56+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:42+0000\n"
 "Language-Team: French\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: out-statusnet\n"
@@ -77,8 +77,13 @@ msgstr "FermÃ©"
 msgid "Save access settings"
 msgstr "Sauvegarder les paramÃ¨tres dâaccÃ¨s"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Enregistrer"
@@ -108,7 +113,7 @@ msgstr "Page non trouvÃ©e."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilisateur non trouvÃ©."
@@ -352,7 +357,7 @@ msgstr "Aucun statut trouvÃ© avec cet identifiant. "
 msgid "This status is already a favorite."
 msgstr "Cet avis est dÃ©jÃ  un favori."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Impossible de crÃ©er le favori."
 
@@ -470,7 +475,7 @@ msgstr "Groupe non trouvÃ©."
 msgid "You are already a member of that group."
 msgstr "Vous Ãªtes dÃ©jÃ  membre de ce groupe."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "Vous avez Ã©tÃ© bloquÃ© de ce groupe par lâadministrateur."
 
@@ -521,17 +526,17 @@ msgid "Invalid token."
 msgstr "Jeton incorrect."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -569,12 +574,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "Le jeton de connexion %s a Ã©tÃ© refusÃ© et rÃ©voquÃ©."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Soumission de formulaire inattendue."
 
@@ -838,27 +846,44 @@ msgstr ""
 "abonnÃ© Ã  votre compte, ne pourra plus sây abonner de nouveau, et vous ne "
 "serez pas informÃ© des @-rÃ©ponses de sa part."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Non"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Ne pas bloquer cet utilisateur"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Oui"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Bloquer cet utilisateur"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Impossible dâenregistrer les informations de blocage."
 
@@ -871,8 +896,8 @@ msgstr "Impossible dâenregistrer les informations de blocage."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Aucun groupe trouvÃ©."
 
@@ -931,16 +956,24 @@ msgstr "Type dâadresse non reconnu : %s."
 msgid "That address has already been confirmed."
 msgstr "Cette adresse a dÃ©jÃ  Ã©tÃ© confirmÃ©e."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Impossible de mettre Ã  jour lâutilisateur."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Impossible de supprimer le courriel de confirmation."
 
@@ -995,11 +1028,13 @@ msgstr ""
 "donnÃ©es Ã  son propos de la base de donnÃ©es, y compris toutes les connexions "
 "utilisateur existantes."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Ne pas supprimer cette application"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Supprimer cette application"
 
@@ -1034,11 +1069,13 @@ msgstr "Supprimer cet avis"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Voulez-vous vraiment supprimer cet avis ?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Ne pas supprimer cet avis"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Supprimer cet avis"
 
@@ -1062,7 +1099,8 @@ msgstr ""
 "Voulez-vous vraiment supprimer cet utilisateur ? Ceci effacera toutes les "
 "donnÃ©es Ã  son propos de la base de donnÃ©es, sans sauvegarde."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"
 
@@ -1175,15 +1213,13 @@ msgid "Reset back to default"
 msgstr "Revenir aux valeurs par dÃ©faut"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Enregistrer"
 
@@ -1309,31 +1345,43 @@ msgstr "Impossible de crÃ©er les alias."
 msgid "Options saved."
 msgstr "Vos options ont Ã©tÃ© enregistrÃ©es."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ParamÃ¨tres du courriel"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Configurez les courriels que vous souhaitez recevoir de %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresse"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Adresse Ã©lectronique"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Adresse courriel actuellement confirmÃ©e."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Retirer"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1341,108 +1389,143 @@ msgstr ""
 "En attente dâune confirmation pour cette adresse. VÃ©rifiez votre boÃ®te de "
 "rÃ©ception (et celle de spam !) pour recevoir de nouvelles instructions."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Annuler"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Adresse Ã©lectronique"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adresse de courriel (ex : nom@example.org)"
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ajouter"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Courriel entrant"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Ãcrivez Ã  cette adresse courriel pour poster de nouveaux avis."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Nouvelle adresse courriel pour poster ; annule lâancienne."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Nouveau"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "PrÃ©fÃ©rences"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Avertissez-moi par courriel des nouveaux abonnements."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Envoyez-moi un courriel quand un utilisateur ajoute un de mes avis Ã  ses "
 "favoris."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Envoyez-moi un courriel quand quelquâun mâenvoie un message personnel."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Envoyez-moi un courriel quand quelquâun mâenvoie une rÃ©ponse Â« @Â Â»."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Autoriser mes amis Ã  mâenvoyer des courriels et des clins dâÅil."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Je veux envoyer mes avis par courriel."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publier un MicroID pour mon adresse courriel."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "PrÃ©fÃ©rences enregistrÃ©es"
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "PrÃ©fÃ©rences de conception enregistrÃ©es."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Aucune adresse courriel."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Impossible dâutiliser cette adresse courriel"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse courriel invalide."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Vous utilisez dÃ©jÃ  cette adresse courriel."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Cette adresse courriel appartient dÃ©jÃ  Ã  un autre utilisateur."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Impossible dâinsÃ©rer le code de confirmation."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1450,43 +1533,56 @@ msgstr ""
 "Un code de confirmation a Ã©tÃ© envoyÃ© Ã  lâadresse courriel indiquÃ©e. VÃ©rifiez "
 "votre boÃ®te de rÃ©ception pour rÃ©cupÃ©rer le code et les instructions."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Aucune confirmation Ã  annuler."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Cette adresse de messagerie instantanÃ©e est erronÃ©e."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Confirmation annulÃ©e."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Ceci nâest pas votre adresse courriel."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Lâadresse a Ã©tÃ© supprimÃ©e."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Aucune adresse de courriel entrant."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Impossible de mettre Ã  jour le dossier de lâutilisateur."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Lâadresse de courriel entrant a Ã©tÃ© supprimÃ©e."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nouvelle adresse de courriel entrant ajoutÃ©e."
 
@@ -1677,15 +1773,17 @@ msgstr ""
 "seront supprimÃ©s du groupe ; il leur sera interdit dây poster et de sây "
 "abonner Ã  lâavenir."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Ne pas bloquer cet utilisateur pour ce groupe"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Bloquer cet utilisateur de de groupe"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 "Erreur de la base de donnÃ©es lors du blocage de lâutilisateur du groupe."
@@ -1871,11 +1969,15 @@ msgstr "Cet utilisateur nâest pas bloquÃ© du groupe."
 msgid "Error removing the block."
 msgstr "Erreur lors de lâannulation du blocage."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "ParamÃ¨tres de messagerie instantanÃ©e"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1885,15 +1987,24 @@ msgstr ""
 "(%%doc.im%%) Jabber/GTalk. Configurez votre adresse et vos paramÃ¨tres ci-"
 "dessous."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "La messagerie instantanÃ©e nâest pas disponible."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Adresse de messagerie instantanÃ©e"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Adresse Jabber/GTalk actuellement confirmÃ©e."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1903,11 +2014,9 @@ msgstr ""
 "Jabber/GTalk pour recevoir de nouvelles instructions. (Avez-vous ajoutÃ© %s Ã  "
 "votre liste de contacts ?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Adresse de messagerie instantanÃ©e"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1917,46 +2026,68 @@ msgstr ""
 "votre liste dâamis dans votre logiciel de messagerie instantanÃ©e ou dans "
 "GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "PrÃ©fÃ©rences"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envoyez-moi les avis par Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 "Poster un avis chaque fois que mon statut est modifiÃ© dans Jabber/GTalk"
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Envoyez-moi par Jabber/GTalk les rÃ©ponses des personnes auxquelles je ne "
 "suis pas abonnÃ©."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publier un MicroID pour mon adresse Jabber/GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "PrÃ©fÃ©rences enregistrÃ©es"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Aucun identifiant Jabber"
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossible dâutiliser cet identifiant Jabber"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Identifiant Jabber invalide."
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Vous utilisez dÃ©jÃ  cet idenfiant Jabber."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Identifiant Jabber dÃ©jÃ  utilisÃ© par un autre utilisateur."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1965,10 +2096,35 @@ msgstr ""
 "Un code de confirmation a Ã©tÃ© envoyÃ© Ã  votre adresse de messagerie "
 "instantanÃ©e. Vous devez approuver %s pour recevoir des messages."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Cette adresse de messagerie instantanÃ©e est erronÃ©e."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Impossible de supprimer le courriel de confirmation."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Confirmation annulÃ©e."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Ceci nâest pas votre identifiant Jabber."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Lâadresse a Ã©tÃ© supprimÃ©e."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2012,7 +2168,9 @@ msgstr "Inviter de nouveaux utilisateurs"
 msgid "You are already subscribed to these users:"
 msgstr "Vous Ãªtes dÃ©jÃ  abonnÃ© Ã  ces utilisateurs :"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2138,7 +2296,9 @@ msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
 msgid "No nickname or ID."
 msgstr "Aucun pseudo ou ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s a rejoint le groupe %2$s"
@@ -2147,11 +2307,13 @@ msgstr "%1$s a rejoint le groupe %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Vous devez ouvrir une session pour quitter un groupe."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "Vous nâÃªtes pas membre de ce groupe."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s a quittÃ© le groupe %2$s"
@@ -2268,12 +2430,12 @@ msgstr "Remplissez les champs ci-dessous pour crÃ©er un nouveau groupe :"
 msgid "New message"
 msgstr "Nouveau message"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Vous ne pouvez pas envoyer de messages Ã  cet utilisateur."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Aucun contenu !"
 
@@ -2281,7 +2443,7 @@ msgstr "Aucun contenu !"
 msgid "No recipient specified."
 msgstr "Aucun destinataire nâa Ã©tÃ© spÃ©cifiÃ©."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2542,7 +2704,7 @@ msgid "6 or more characters"
 msgstr "6 caractÃ¨res ou plus"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Confirmer"
 
@@ -3948,47 +4110,77 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Enregistrer l'avis du site"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "ParamÃ¨tres SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "Vous pouvez recevoir des messages SMS par courriel en provenance de %%site."
 "name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "Les SMS ne sont pas disponibles."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Adresse de messagerie instantanÃ©e"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "NumÃ©ro de tÃ©lÃ©phone actuellement confirmÃ© pour recevoir les SMS."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "NumÃ©ro de tÃ©lÃ©phone en attente de confirmation."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Code de confirmation"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Entrez le code que vous avez reÃ§u sur votre tÃ©lÃ©phone."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmer"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "NumÃ©ro de tÃ©lÃ©phone pour les SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 "NumÃ©ro de tÃ©lÃ©phone, sans ponctuation ni espaces, incluant le code rÃ©gional"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "PrÃ©fÃ©rences"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3996,23 +4188,34 @@ msgstr ""
 "Envoyez-moi les avis par SMS ; je comprends que cela pourrait affecter ma "
 "facture de tÃ©lÃ©phonie mobile."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "PrÃ©fÃ©rences enregistrÃ©es"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Aucun numÃ©ro de tÃ©lÃ©phone."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Aucun fournisseur sÃ©lectionnÃ©."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Vous utilisez dÃ©jÃ  ce numÃ©ro de tÃ©lÃ©phone."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Ce numÃ©ro de tÃ©lÃ©phone est dÃ©jÃ  utilisÃ©."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -4021,23 +4224,42 @@ msgstr ""
 "VÃ©rifiez votre boÃ®te de rÃ©ception pour rÃ©cupÃ©rer le code et les instructions "
 "pour son utilisation."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Ce code de confirmation est incorrect."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Confirmation annulÃ©e."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Ceci nâest pas votre numÃ©ro de tÃ©lÃ©phone."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "NumÃ©ro de tÃ©lÃ©phone pour les SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Fournisseur de tÃ©lÃ©phonie mobile"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "SÃ©lectionnez un fournisseur de tÃ©lÃ©phone mobile"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4047,7 +4269,8 @@ msgstr ""
 "qui accepte la rÃ©ception de SMS par courriel mais qui nâest pas listÃ© ici, "
 "Ã©crivez-nous Ã  %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Aucun code entrÃ©"
 
@@ -5255,10 +5478,8 @@ msgstr ""
 "AccÃ¨s par dÃ©faut pour cette application : en lecture seule ou en lecture-"
 "Ã©criture"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -5334,34 +5555,40 @@ msgstr "Ãchec de la commande"
 msgid "Notice with that id does not exist"
 msgstr "Aucun avis avec cet identifiant nâexiste"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "Aucun avis rÃ©cent pour cet utilisateur"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Impossible de trouver un utilisateur avec le pseudo %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Impossible de trouver un utilisateur local portant le pseudo %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "DÃ©solÃ©, cette commande nâa pas encore Ã©tÃ© implÃ©mentÃ©e."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Ãa nâa pas de sens de se faire un clin dâÅil Ã  soi-mÃªme !"
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Clin dâÅil envoyÃ© Ã  %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5372,57 +5599,55 @@ msgstr ""
 "AbonnÃ©s : %2$s\n"
 "Messages : %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Avis ajoutÃ© aux favoris."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Vous Ãªtes dÃ©jÃ  membre de ce groupe"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Impossible dâinscrire lâutilisateur %s au groupe %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s a rejoint le groupe %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Impossible de joindre lâutilisateur %1$s au groupe %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "Impossible de retirer lâutilisateur %s du groupe %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s a quittÃ© le groupe %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nom complet : %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Emplacement : %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site Web : %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Ã propos : %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5431,144 +5656,150 @@ msgstr ""
 "%s est un profil distant ; vous ne pouvez envoyer de messages directs qu'aux "
 "utilisateurs du mÃªme serveur."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
-"Message trop long ! La taille maximale est de %d caractÃ¨res ; vous en avez "
-"entrÃ© %d."
+"Message trop long ! La taille maximale est de %1$d caractÃ¨res ; vous en avez "
+"entrÃ© %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Message direct envoyÃ© Ã  %s."
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Une erreur est survenue pendant lâenvoi de votre message."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "Impossible de reprendre votre propre avis"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "Avis dÃ©jÃ  repris"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Avis de %s repris"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Erreur lors de la reprise de lâavis."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 "Avis trop long ! La taille maximale est de %d caractÃ¨res ; vous en avez "
 "entrÃ© %d."
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "RÃ©ponse Ã  %s envoyÃ©e"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "ProblÃ¨me lors de lâenregistrement de lâavis."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Indiquez le nom de lâutilisateur auquel vous souhaitez vous abonner"
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossible de s'inscrire aux profils OMB par cette commande."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "AbonnÃ© Ã  %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Indiquez le nom de lâutilisateur duquel vous souhaitez vous dÃ©sabonner"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "DÃ©sabonnÃ© de %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Cette commande nâa pas encore Ã©tÃ© implÃ©mentÃ©e."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Avertissements dÃ©sactivÃ©s."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "Impossible de dÃ©sactiver les avertissements."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Avertissements activÃ©s."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Impossible dâactiver les avertissements."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "La commande dâouverture de session est dÃ©sactivÃ©e"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 "Ce lien nâest utilisable quâune seule fois, et est valable uniquement "
 "pendant 2 minutes : %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "DÃ©sabonnÃ© de %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "Vous nâÃªtes abonnÃ©(e) Ã  personne."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vous Ãªtes abonnÃ© Ã  cette personne :"
 msgstr[1] "Vous Ãªtes abonnÃ© Ã  ces personnes :"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "Personne ne sâest abonnÃ© Ã  vous."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Cette personne est abonnÃ©e Ã  vous :"
 msgstr[1] "Ces personnes sont abonnÃ©es Ã  vous :"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "Vous nâÃªtes membre dâaucun groupe."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vous Ãªtes membre de ce groupe :"
 msgstr[1] "Vous Ãªtes membre de ces groupes :"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6545,6 +6776,10 @@ msgstr "Aucun argument de retour."
 msgid "Repeat this notice?"
 msgstr "Reprendre cet avis ?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Oui"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Reprendre cet avis"
@@ -6731,47 +6966,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "ModÃ©rateur"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "il y a quelques secondes"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "il y a 1 minute"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "il y a %d minutes"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "il y a 1 heure"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "il y a %d heures"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "il y a 1 jour"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "il y a %d jours"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "il y a 1 mois"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "il y a %d mois"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "il y a environ 1 an"
 
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 7b64c2712e..93e4bb6580 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:00+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:45+0000\n"
 "Language-Team: Irish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
 "X-Message-Group: out-statusnet\n"
@@ -79,8 +79,13 @@ msgstr "Bloquear"
 msgid "Save access settings"
 msgstr "ConfiguraciÃ³ns de Twitter"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -112,7 +117,7 @@ msgstr "Non existe a etiqueta."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "NingÃºn usuario."
@@ -351,7 +356,7 @@ msgstr "Non se atopou un estado con ese ID."
 msgid "This status is already a favorite."
 msgstr "Este chÃo xa Ã© un favorito!"
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Non se puido crear o favorito."
 
@@ -475,7 +480,7 @@ msgstr "MÃ©todo da API non atopado"
 msgid "You are already a member of that group."
 msgstr "Xa estas suscrito a estes usuarios:"
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -527,17 +532,17 @@ msgid "Invalid token."
 msgstr "TamaÃ±o invÃ¡lido."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -571,12 +576,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Envio de formulario non esperada."
 
@@ -845,29 +853,46 @@ msgstr ""
 "do teur perfil, non serÃ¡ capaz de suscribirse a ti nun futuro, e non vas a "
 "ser notificado de ningunha resposta-@ del."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 #, fuzzy
 msgid "Do not block this user"
 msgstr "Bloquear usuario"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Si"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 #, fuzzy
 msgid "Block this user"
 msgstr "Bloquear usuario"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Erro ao gardar informaciÃ³n de bloqueo."
 
@@ -880,8 +905,8 @@ msgstr "Erro ao gardar informaciÃ³n de bloqueo."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 #, fuzzy
 msgid "No such group."
 msgstr "Non existe a etiqueta."
@@ -943,16 +968,24 @@ msgstr "Tipo de enderezo %s non recoÃ±ecido"
 msgid "That address has already been confirmed."
 msgstr "Esa direcciÃ³n xa foi confirmada."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Non se puido actualizar o usuario."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Non se pode eliminar a confirmaciÃ³n de email."
 
@@ -1011,12 +1044,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "Non se pode eliminar este chÃos."
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "Eliminar chÃo"
@@ -1053,12 +1088,14 @@ msgstr "Eliminar chÃo"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Estas seguro que queres eliminar este chÃo?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "Non se pode eliminar este chÃos."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 #, fuzzy
 msgid "Delete this notice"
 msgstr "Eliminar chÃo"
@@ -1084,7 +1121,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 #, fuzzy
 msgid "Delete this user"
 msgstr "Eliminar chÃo"
@@ -1205,15 +1243,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Gardar"
 
@@ -1357,32 +1393,45 @@ msgstr "Non se puido crear o favorito."
 msgid "Options saved."
 msgstr "ConfiguraciÃ³ns gardadas."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "ConfiguraciÃ³n de Correo"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Xestina como recibir correo dende %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Enderezo"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Enderezos de correo"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "DirecciÃ³ns de correo confirmadas actualmente."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Eliminar"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1391,108 +1440,142 @@ msgstr ""
 "GTalk que ten que haber unha mensaxe coas seguintes instruciÃ³ns. (Engadiches "
 "a %s Ã¡ tÃºa lista de contactos?)"
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Enderezos de correo"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "DirecciÃ³n de correo, coma \"Nomede Usuario@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Engadir"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Correo Entrante"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Enviar un correo a esta direcciÃ³n para enviar novos chÃos."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Crear unha nova direcciÃ³n de correo para enviar, elimina a antiga."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Preferencias"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "EnvÃame chios de novas suscriciÃ³ns por email."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Enviar un correo cando alguen enganda un chÃo meu coma favorito."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Enviarme un email cando alguÃ©n me envÃe unha mensaxe privada."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Enviarme un email cando alguÃ©n me envÃe unha mensaxe privada."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir aos amigos darme toques e enviarme correos electrÃ³nicos."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Quero enviar chÃos dende o mail."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar unha MicroID dende a miÃ±a direcciÃ³n de correo."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "Preferencias gardadas."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Non se inseriu unha direcciÃ³n de correo"
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Esa direcciÃ³n de correo non se pode normalizar "
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Non Ã© un enderezo de correo vÃ¡lido."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Xa Ã© o teu enderezo de correo."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Este enderezo de correo xa pertence a outro usuario."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Non se puido inserir o cÃ³digo de confirmaciÃ³n."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1501,43 +1584,56 @@ msgstr ""
 "Comproba a tÃºa bandexa de entrada (ou spam!) polo cÃ³digo e instruciÃ³ns que "
 "debes seguir."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Non hai ningunha confirmaciÃ³n pendente para cancelar."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Esa Ã© unha enderezo IM incorrecto."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "ConfirmaciÃ³n cancealada."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Esa non Ã© a tÃºa direcciÃ³n de correo."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Enderezo eliminado."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Non hai direcciÃ³ns de correo entrante"
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Non se puido actualizar o rexistro de usuario."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "DirecciÃ³n de correo entrante eliminada."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Engadida nova direcciÃ³n de correo entrante."
 
@@ -1739,15 +1835,17 @@ msgstr ""
 "do teur perfil, non serÃ¡ capaz de suscribirse a ti nun futuro, e non vas a "
 "ser notificado de ningunha resposta-@ del."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr ""
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr ""
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1927,12 +2025,16 @@ msgstr "O usuario bloqueoute."
 msgid "Error removing the block."
 msgstr "Acounteceu un erro borrando o bloqueo."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "ConfiguraciÃ³ns de IM"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1941,15 +2043,25 @@ msgstr ""
 "Podes enviar e recibir chÃos a travÃ©s de Jabber/GTalk [mensaxes instantÃ¡neos]"
 "(%%doc.im%%). Configura a tÃºa conta e configuraciÃ³ns abaixo."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "Esta pÃ¡xina non estÃ¡ dispoÃ±Ãbel no tipo de medio que aceptas"
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "Enderezo de IM"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "DirecciÃ³ns Jabber/GTalk confirmadas."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1958,12 +2070,9 @@ msgstr ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "Enderezo de IM"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1973,44 +2082,66 @@ msgstr ""
 "asegurate de engadir %s Ã¡ tua lista de contactos no teu cliente de IM ou no "
 "GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviarme advertencias a travÃ©s de Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Post a notice when my Jabber/GTalk status changes."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "EnvÃame respostas a travÃ©s de Jabber/GTalk da xente Ã¡ que non estou suscrito."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar unha MicroID dende a miÃ±a direcciÃ³n de Jabber/GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Preferencias gardadas."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Sen Identificador de Jabber."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Non se pode normalizar ese identificador de Jabber"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Non Ã© un Identificador de Jabber vÃ¡lido"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Xa Ã© a tÃºa conta de Jabber."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "O identificador de Jabber xa pertence a outro usuario."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2019,10 +2150,35 @@ msgstr ""
 "O cÃ³digo de confirmaciÃ³n foi embiado Ã¡ direcciÃ³n IM que engadiches. DeberÃas "
 "engadir a %s como contacto para que che poida enviar mensaxes."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Esa Ã© unha enderezo IM incorrecto."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Non se pode eliminar a confirmaciÃ³n de email."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "ConfirmaciÃ³n cancealada."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Esa non Ã© a tÃºa conta Jabber."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Enderezo eliminado."
+
 #: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2064,7 +2220,9 @@ msgstr "Invitar a novos usuarios"
 msgid "You are already subscribed to these users:"
 msgstr "Xa estas suscrito a estes usuarios:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2188,7 +2346,9 @@ msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 msgid "No nickname or ID."
 msgstr "Sen alcume."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, fuzzy, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%s / Favoritos dende %s"
@@ -2198,12 +2358,14 @@ msgstr "%s / Favoritos dende %s"
 msgid "You must be logged in to leave a group."
 msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "Non estÃ¡s suscrito a ese perfil"
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%s / Favoritos dende %s"
@@ -2318,12 +2480,12 @@ msgstr ""
 msgid "New message"
 msgstr "Nova mensaxe"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Non podes enviar mensaxes a este usurio."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Sen contido!"
 
@@ -2331,7 +2493,7 @@ msgstr "Sen contido!"
 msgid "No recipient specified."
 msgstr "Non se especificou ningÃºn destinatario"
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2598,7 +2760,7 @@ msgid "6 or more characters"
 msgstr "6 ou mÃ¡is caracteres"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -4017,46 +4179,76 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Novo chÃo"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "ConfiguraciÃ³ns de SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Podes recibir mensaxes SMS a travÃ©s do email dende %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "Esta pÃ¡xina non estÃ¡ dispoÃ±Ãbel no tipo de medio que aceptas"
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Enderezo de IM"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "NÃºmero de telÃ©fono actual confirmado mediante SMS."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Agardando a confirmaciÃ³n neste nÃºmero de telÃ©fono."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "CÃ³digo de confirmaciÃ³n."
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Insire o cÃ³digo que recibiches no teu telÃ©fono."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 #, fuzzy
 msgid "SMS phone number"
 msgstr "NÃºmero de TelÃ©fono do SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "NÃºmero de telÃ©fono, sen puntuaciÃ³ns ou espazos, co cÃ³digo de Ã¡rea"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -4064,23 +4256,34 @@ msgstr ""
 "Enviarme chÃos mediante SMS, entendo que a miÃ±a operadora poida cobrarme "
 "grandes facturas."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Preferencias gardadas."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Non hai ningÃºn nÃºmero de telÃ©fono."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Non se seleccionou unha operadora."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Xa Ã© o teu nÃºmero de telÃ©fono."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "O nÃºmero de telÃ©fono xa pertence a outro usuario."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -4090,24 +4293,43 @@ msgstr ""
 "Comproba a tÃºa bandexa de entrada (ou spam!) polo cÃ³digo e instruciÃ³ns que "
 "debes seguir."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Ese Ã© un nÃºmero de confirmaciÃ³n incorrecto."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "ConfirmaciÃ³n cancealada."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Ese non Ã© o teu nÃºmero de telÃ©fono."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "NÃºmero de TelÃ©fono do SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Selecciona unha operadora"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Selecciona unha operadora"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4116,7 +4338,8 @@ msgstr ""
 "Operadora mÃ³bil do teu telÃ©fono. Se sabes se a operadora acepta SMS sobre "
 "email e non estÃ¡ listada aquÃ, envianos unha mensaxe para incluilo en %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Non se inseriu ningÃºn cÃ³digo"
 
@@ -5363,10 +5586,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -5444,34 +5665,40 @@ msgstr "Comando fallido"
 msgid "Notice with that id does not exist"
 msgstr "Non se atopou un perfil con ese ID."
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "O usuario non ten Ãºltimo chio."
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Non se puido actualizar o usuario coa direcciÃ³n de correo electrÃ³nico."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Non se puido actualizar o usuario coa direcciÃ³n de correo electrÃ³nico."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Desculpa, este comando todavÃa non estÃ¡ implementado."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "Toque enviado"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5482,176 +5709,180 @@ msgstr ""
 "Suscriptores: %2$s\n"
 "ChÃos: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "ChÃo marcado coma favorito."
 
-#: lib/command.php:317
+#: lib/command.php:323
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Xa estas suscrito a estes usuarios:"
 
-#: lib/command.php:331
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
 msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
 
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
 #, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s / Favoritos dende %s"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
 msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
 
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "%s / Favoritos dende %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "UbicaciÃ³n: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "PÃ¡xina persoal: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr "Mensaxe demasiado longa - o mÃ¡ximo Ã© 140 caracteres, ti enviaches %d "
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Mensaxe directo a %s enviado"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Erro Ã³ enviar a mensaxe directa."
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "Non se pode activar a notificaciÃ³n."
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "Eliminar chÃo"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "ChÃo publicado"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "Aconteceu un erro Ã³ gardar o chÃo."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Mensaxe demasiado longa - o mÃ¡ximo Ã© 140 caracteres, ti enviaches %d "
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Non se pode eliminar este chÃos."
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Aconteceu un erro Ã³ gardar o chÃo."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especifica o nome do usuario Ã³ que queres suscribirte"
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Non estÃ¡s suscrito a ese perfil"
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Suscrito a %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especifica o nome de usuario Ã³ que queres deixar de seguir"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Desuscribir de %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Comando non implementado."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "NotificaciÃ³n desactivada."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "No se pode desactivar a notificaciÃ³n."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "NotificaciÃ³n habilitada."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Non se pode activar a notificaciÃ³n."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "Desuscribir de %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Non estÃ¡s suscrito a ese perfil"
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Xa estas suscrito a estes usuarios:"
@@ -5660,12 +5891,12 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Outro usuario non se puido suscribir a ti."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Outro usuario non se puido suscribir a ti."
@@ -5674,12 +5905,12 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Non estÃ¡s suscrito a ese perfil"
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Non estÃ¡s suscrito a ese perfil"
@@ -5688,7 +5919,7 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: lib/command.php:812
+#: lib/command.php:838
 #, fuzzy
 msgid ""
 "Commands:\n"
@@ -6641,6 +6872,10 @@ msgstr "Non hai argumento id."
 msgid "Repeat this notice?"
 msgstr "Non se pode eliminar este chÃos."
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Si"
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6847,47 +7082,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "fai uns segundos"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "fai un minuto"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fai %d minutos"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "fai unha hora"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "fai %d horas"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "fai un dÃa"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "fai %d dÃas"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "fai un mes"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "fai %d meses"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "fai un ano"
 
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 1d1a2ba8bd..30bf985760 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:03+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:48+0000\n"
 "Language-Team: Galician\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64943); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: out-statusnet\n"
@@ -72,8 +72,13 @@ msgstr "Pechado"
 msgid "Save access settings"
 msgstr "Gardar a configuraciÃ³n de acceso"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Gardar"
@@ -104,7 +109,7 @@ msgstr "Non existe tal pÃ¡xina"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Non existe tal usuario."
@@ -348,7 +353,7 @@ msgstr "Non se atopou ningÃºn estado con esa ID."
 msgid "This status is already a favorite."
 msgstr "Este estado xa Ã© dos favoritos."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Non se puido crear o favorito."
 
@@ -467,7 +472,7 @@ msgstr "Non se atopou o grupo!"
 msgid "You are already a member of that group."
 msgstr "Xa forma parte dese grupo."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador bloqueouno nese grupo."
 
@@ -518,17 +523,17 @@ msgid "Invalid token."
 msgstr "Pase incorrecto."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -563,12 +568,15 @@ msgstr "Autorizouse a ficha da solicitude %s. IntercÃ¡mbiea por un pase."
 msgid "The request token %s has been denied and revoked."
 msgstr "Denegouse e revogouse a ficha da solicitude %s."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "EnvÃo de formulario inesperado."
 
@@ -830,27 +838,44 @@ msgstr ""
 "subscrito a vostede mentres siga bloqueado, e vostede non recibirÃ¡ ningunha "
 "das sÃºas respostas."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Non"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Non bloquear este usuario"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Si"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Bloquear este usuario"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Non se puido gardar a informaciÃ³n do bloqueo."
 
@@ -863,8 +888,8 @@ msgstr "Non se puido gardar a informaciÃ³n do bloqueo."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Non existe tal grupo."
 
@@ -923,16 +948,24 @@ msgstr "Non se recoÃ±eceu o tipo de enderezo %s"
 msgid "That address has already been confirmed."
 msgstr "Ese enderezo xa se confirmou."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Non se puido actualizar o usuario."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Non se puido borrar a confirmaciÃ³n por correo electrÃ³nico."
 
@@ -987,11 +1020,13 @@ msgstr ""
 "datos da aplicaciÃ³n da base de datos, incluÃdas todas as conexiÃ³ns do "
 "usuario existentes."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Non borrar a aplicaciÃ³n"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Borrar a aplicaciÃ³n"
 
@@ -1026,11 +1061,13 @@ msgstr "Borrar a nota"
 msgid "Are you sure you want to delete this notice?"
 msgstr "EstÃ¡ seguro de querer borrar esta nota?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Non borrar esta nota"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Borrar esta nota"
 
@@ -1054,7 +1091,8 @@ msgstr ""
 "EstÃ¡ seguro de querer borrar este usuario? Isto borrarÃ¡ todos os datos do "
 "usuario da base de datos, sen posibilidade de recuperalos."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Borrar o usuario"
 
@@ -1167,15 +1205,13 @@ msgid "Reset back to default"
 msgstr "Volver ao deseÃ±o por defecto"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Gardar"
 
@@ -1301,31 +1337,43 @@ msgstr "Non se puideron crear os pseudÃ³nimos."
 msgid "Options saved."
 msgstr "GardÃ¡ronse as preferencias."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ConfiguraciÃ³n do correo electrÃ³nico"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Xestiona a forma en que recibes correo electrÃ³nico de %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Enderezo"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Enderezo de correo electrÃ³nico"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Enderezo de correo electrÃ³nico confirmado actualmente."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Borrar"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1333,113 +1381,148 @@ msgstr ""
 "Agardando pola confirmaciÃ³n deste enderezo. Busque unha mensaxe con mÃ¡is "
 "instruciÃ³ns na sÃºa bandexa de entrada (e na de correo non desexado!)."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Enderezo de correo electrÃ³nico"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Enderezo de correo electrÃ³nico, coma \"nomedeusuario@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Engadir"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Correo entrante"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 "Enviar un correo electrÃ³nico a este enderezo para publicar novas notas."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Establece un novo enderezo de correo electrÃ³nico no que publicar, e cancela "
 "o vello."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Preferencias"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviarme notas acerca de novas subscriciÃ³ns por correo electrÃ³nico."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "EnviÃ¡deme un correo electrÃ³nico cando alguÃ©n marque como favorito algunha "
 "das miÃ±as notas."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "EnviÃ¡deme un correo electrÃ³nico cando alguÃ©n me envÃe unha mensaxe privada."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "EnviÃ¡deme un correo electrÃ³nico cando alguÃ©n me envÃe unha resposta."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Permitirlles aos meus amigos facerme acenos e enviarme correos electrÃ³nicos."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Quero publicar notas por correo electrÃ³nico."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar unha MicroID para o meu enderezo de correo electrÃ³nico."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "GardÃ¡ronse as preferencias."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "GardÃ¡ronse as preferencias de deseÃ±o."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Non hai enderezo de correo electrÃ³nico."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Non se pode normalizar ese enderezo de correo electrÃ³nico"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "O enderezo de correo electrÃ³nico Ã© incorrecto."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Ese enderezo de correo electrÃ³nico Ã© o que ten agora."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Ese enderezo de correo electrÃ³nico xa pertence a outro usuario."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Non se puido inserir o cÃ³digo de confirmaciÃ³n."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1448,43 +1531,56 @@ msgstr ""
 "engadiu. Busque o cÃ³digo e as instruciÃ³ns para usalo na sÃºa bandexa de "
 "entrada (e na de correo non desexado!)."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Non hai ningunha confirmaciÃ³n pendente que cancelar."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Ese enderezo de mensaxerÃa instantÃ¡nea Ã© incorrecto."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Cancelouse a confirmaciÃ³n."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Ese non Ã© o seu enderezo de correo electrÃ³nico."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Borrouse o enderezo."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Non hai ningÃºn enderezo ao que enviar."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Non se puido actualizar o rexistro do usuario."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Borrouse o enderezo de correo electrÃ³nico entrante."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Engadiuse un novo enderezo de correo electrÃ³nico entrante."
 
@@ -1674,15 +1770,17 @@ msgstr ""
 "do grupo, sen a posibilidade de publicar nada nel nin volver subscribirse a "
 "el no futuro."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Non excluÃr deste grupo a este usuario"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "ExcluÃr deste grupo a este usuario"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "Houbo un erro na base de datos ao excluÃr do grupo ao usuario."
 
@@ -1864,11 +1962,15 @@ msgstr "O usuario non estÃ¡ excluÃdo do grupo."
 msgid "Error removing the block."
 msgstr "Houbo un erro ao facer efectiva a readmisiÃ³n."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "ConfiguraciÃ³n da mensaxerÃa instantÃ¡nea"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1877,15 +1979,24 @@ msgstr ""
 "Pode enviar e recibir notas mediante [mensaxes instantÃ¡neas](%%doc.im%%) de "
 "Jabber/GTalk. Configure a continuaciÃ³n o seu enderezo e preferencias."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "A mensaxerÃa instantÃ¡nea non estÃ¡ dispoÃ±ible."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Enderezo de mensaxerÃa instantÃ¡nea"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Enderezo de Jabber/GTalk confirmado actualmente."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1895,11 +2006,9 @@ msgstr ""
 "GTalk unha mensaxe con mÃ¡is instruciÃ³ns. (Engadiu a %s Ã¡ sÃºa lista de "
 "amigos?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Enderezo de mensaxerÃa instantÃ¡nea"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1909,45 +2018,67 @@ msgstr ""
 "primeiro de engadir a %s Ã¡ sÃºa lista de amigos no seu cliente de mensaxerÃa "
 "instantÃ¡nea ou en GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "EnviÃ¡deme as notas mediante Jabber ou GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar unha nota cando cambie o meu estado en Jabber ou GTalk."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "EnviÃ¡deme as respostas mediante Jabber ou GTalk da xente Ã¡ que non estou "
 "subscrita."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar unha MicroID para o meu enderezo de Jabber ou GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "GardÃ¡ronse as preferencias."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Non existe ningunha ID de Jabber."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Non se pode normalizar esa ID de Jabber"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "A ID de Jabber non Ã© correcta"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Esa xa Ã© a sÃºa ID de Jabber."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Esa ID de Jabber xa corresponde a un usuario."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1956,10 +2087,35 @@ msgstr ""
 "Enviouse un cÃ³digo de confirmaciÃ³n ao enderezo de mensaxerÃa instantÃ¡nea que "
 "engadiu. Ten que aprobar que %s lle envÃe mensaxes."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Ese enderezo de mensaxerÃa instantÃ¡nea Ã© incorrecto."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Non se puido borrar a confirmaciÃ³n por correo electrÃ³nico."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Cancelouse a confirmaciÃ³n."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Esa ID de Jabber non Ã© sÃºa."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Borrouse o enderezo."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2001,7 +2157,9 @@ msgstr "Invitar a novos usuarios"
 msgid "You are already subscribed to these users:"
 msgstr "Xa estÃ¡ subscrito aos seguintes usuarios:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2124,7 +2282,9 @@ msgstr "Ten que identificarse para unirse a un grupo."
 msgid "No nickname or ID."
 msgstr "Nin alcume nin ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s uniuse ao grupo %2$s"
@@ -2133,11 +2293,13 @@ msgstr "%1$s uniuse ao grupo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Ten que identificarse para deixar un grupo."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "Non pertence a ese grupo."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
@@ -2252,12 +2414,12 @@ msgstr "Utilice o seguinte formulario para crear un novo grupo."
 msgid "New message"
 msgstr "Mensaxe nova"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Non pode enviarlle unha mensaxe a este usuario."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Non hai contido ningÃºn!"
 
@@ -2265,7 +2427,7 @@ msgstr "Non hai contido ningÃºn!"
 msgid "No recipient specified."
 msgstr "Non se especificou ningÃºn destinatario."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non se envÃe unha mensaxe, limÃtese a pensar nela."
@@ -2526,7 +2688,7 @@ msgid "6 or more characters"
 msgstr "Seis ou mÃ¡is caracteres"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -3844,95 +4006,156 @@ msgstr ""
 msgid "Save site notice"
 msgstr ""
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr ""
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr ""
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Enderezo de mensaxerÃa instantÃ¡nea"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr ""
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferencias"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "GardÃ¡ronse as preferencias."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr ""
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr ""
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Cancelouse a confirmaciÃ³n."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr ""
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Borrouse o enderezo."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr ""
 
@@ -5075,10 +5298,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -5152,34 +5373,40 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr ""
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr ""
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr ""
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr ""
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5187,195 +5414,199 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr ""
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr ""
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr ""
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr ""
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr ""
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
+msgstr "O usuario %1$s non se puido eliminar do grupo %2$s."
 
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr ""
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr ""
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr ""
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr ""
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr ""
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr ""
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr ""
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr ""
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vostede estÃ¡ subscrito a esta persoa:"
 msgstr[1] "Vostede estÃ¡ subscrito a estas persoas:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr ""
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta persoa estÃ¡ subscrita a vostede:"
 msgstr[1] "Estas persoas estÃ¡n subscritas a vostede:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr ""
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vostede pertence a este grupo:"
 msgstr[1] "Vostede pertence a estes grupos:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6196,6 +6427,10 @@ msgstr ""
 msgid "Repeat this notice?"
 msgstr ""
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Si"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr ""
@@ -6382,47 +6617,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr ""
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr ""
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr ""
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr ""
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr ""
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr ""
 
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index ab30f9d503..296330eb63 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:06+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:52+0000\n"
 "Language-Team: Hebrew\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: out-statusnet\n"
@@ -76,8 +76,13 @@ msgstr "××× ××©×ª××© ×××."
 msgid "Save access settings"
 msgstr "××××¨××ª"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -109,7 +114,7 @@ msgstr "××× ××××¢× ×××."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "××× ××©×ª××© ×××."
@@ -345,7 +350,7 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr "××× ×××¨ ××××× ×-Jabber ×©××."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr ""
 
@@ -467,7 +472,7 @@ msgstr "×× × ××¦×"
 msgid "You are already a member of that group."
 msgstr "×××¨ × ×× ×¡×ª ×××¢×¨××ª!"
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -520,17 +525,17 @@ msgid "Invalid token."
 msgstr "×××× ×× ×××§×."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -564,12 +569,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "×××©×ª ×××¤×¡ ×× ×¦×¤×××."
 
@@ -835,29 +843,46 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "××"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 #, fuzzy
 msgid "Do not block this user"
 msgstr "××× ××©×ª××© ×××."
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "××"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 #, fuzzy
 msgid "Block this user"
 msgstr "××× ××©×ª××© ×××."
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr ""
 
@@ -870,8 +895,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 #, fuzzy
 msgid "No such group."
 msgstr "××× ××××¢× ×××."
@@ -933,16 +958,24 @@ msgstr "×¡×× ×× ××××× ×©× ××ª×××ª %s"
 msgid "That address has already been confirmed."
 msgstr "××ª×××ª ×× ×××¨ ×××©×¨×."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "×¢××××× ×××©×ª××© × ××©×."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
@@ -1000,12 +1033,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "××× ××××¢× ×××."
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "×ª××¨ ××ª ×¢×¦×× ×××ª × ××©×× ××¢× ××× ×©×× ×-140 ×××ª×××ª"
@@ -1039,12 +1074,14 @@ msgstr ""
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "××× ××××¢× ×××."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr ""
 
@@ -1069,7 +1106,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 #, fuzzy
 msgid "Delete this user"
 msgstr "××× ××©×ª××© ×××."
@@ -1190,15 +1228,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "×©×××¨"
 
@@ -1336,180 +1372,240 @@ msgstr "×©×××¨×ª ××××¢ ××ª××× × × ××©×"
 msgid "Options saved."
 msgstr "×××××¨××ª × ×©××¨×."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "××××¨××ª ××¤×¨××¤××"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "××ª×××ª"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "××ª×××ª ××¡×¨×× ××××××"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr ""
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "××¡×¨"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "×××"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "××ª×××ª ××¡×¨×× ××××××"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "×××¡×£"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "×××©"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "××¢××¤××ª"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr ""
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "××¢××¤××ª × ×©××¨×."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr ""
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr ""
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr ""
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr ""
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "××× ×¡×ª ×§×× ××××©××¨ × ××©××."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "××× ×××©××¨ ×××ª×× ×©× ××ª× ××××."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "×××× ××ª×××ª ××¡×¨×× ×××××× ×©××××."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "××××©××¨ ××××."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr ""
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "×××ª×××ª ×××¡×¨×."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr ""
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr ""
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1709,17 +1805,19 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 #, fuzzy
 msgid "Do not block this user from this group"
 msgstr "× ××©×× ×××¤× ×× ××©×¨×ª: %s"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 #, fuzzy
 msgid "Block this user from this group"
 msgstr "××× ××©×ª××© ×××."
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1900,12 +1998,16 @@ msgstr "×××©×ª××© ××× ×¤×¨××¤××."
 msgid "Error removing the block."
 msgstr "×©×××× ××©×××¨×ª ×××©×ª××©."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "××××¨××ª ××¡×¨×× ××××××"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1914,16 +2016,26 @@ msgstr ""
 "××¤×©×¨ ××©××× ×××§×× ××××¢××ª ××¨× Jabber/GTalk [instant messages](%%doc.im%%) ××××¨ "
 "××ª ××ª×××ª× ×××¢××¤××ª×× ××××."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 #, fuzzy
 msgid "IM is not available."
 msgstr "×¢××× ×× ××× × ×××× ××¡×× ×××× ×©××ª× ×××× ××§××"
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "××ª×××ª ××¡×¨×× ××××××"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "××ª×××ª ××××©×¨×ª × ×××××ª ×©× Jabber/GTalk."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1932,12 +2044,9 @@ msgstr ""
 "×××× ××××©××¨ ××ª×××ª ××. ××××§ ××ª ××©××× ×-Jabber/GTalk ×©×× ××§×××ª ××¡×¨ ×¢× ×××¨×××ª "
 "× ××¡×¤××ª×¥ (××× ×××¡×¤×ª ××ª %s ××¨×©×××ª ××××¨×× ×©××?)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "××ª×××ª ××¡×¨×× ××××××"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1946,43 +2055,65 @@ msgstr ""
 "××ª×××ª Jabber ×× GTalk, ×××× \"UserName@example.org\". ×××¡×£ ××ª %s ×× ×¨×©×××ª "
 "××××¨×× ××ª××× ×ª ××××¡×¨×× ××××××× ×× GTalk ×©××."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "××¢××¤××ª"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "×©×× ×× ××××¢××ª ××¨× Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "×¤×¨×¡× ××××¢× ××©×©××¨×ª ××¡××××¡ ×©×× ×-Jabber/GTalk ××ª×¢××× ×ª."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "××¢××¤××ª × ×©××¨×."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "××× ××××× Jabber ×××."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "×× × ××ª× ×× ×¨×× ××ª ××××ª ×-Jabber ×××"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "×× ×¢××× ×××××× ×××××× Jabber"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "××× ×××¨ ××××× ×-Jabber ×©××."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "××××× ×-Jabber ×××¨ ×©××× ×××©×ª××© ×××¨."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1991,10 +2122,35 @@ msgstr ""
 "×§×× ×××©××¨ × ×©×× ×× ××ª×××ª ×××¡×¨×× ××××××× ×©×××¡×¤×ª. ×¢××× ×××©×¨ ××ª %s ××©××××ª ××¡×¨×× "
 "×××××× ××××."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "×××× ××ª×××ª ××¡×¨×× ×××××× ×©××××."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "××× ×¡×ª ×§×× ××××©××¨ × ××©××."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "××××©××¨ ××××."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "××× ×× ××××× ×-Jabber ×©××."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "×××ª×××ª ×××¡×¨×."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2035,7 +2191,9 @@ msgstr ""
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2130,7 +2288,9 @@ msgstr ""
 msgid "No nickname or ID."
 msgstr "××× ××× ××"
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
@@ -2139,12 +2299,14 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "××¡××××¡ ×©× %1$s ×-%2$s "
@@ -2255,12 +2417,12 @@ msgstr ""
 msgid "New message"
 msgstr "××××¢× ×××©×"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr ""
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "××× ×ª×××!"
 
@@ -2268,7 +2430,7 @@ msgstr "××× ×ª×××!"
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2530,7 +2692,7 @@ msgid "6 or more characters"
 msgstr "××¤×××ª 6 ×××ª×××ª"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "××©×¨"
 
@@ -3881,98 +4043,159 @@ msgstr ""
 msgid "Save site notice"
 msgstr "××××¢× ×××©×"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "××××¨××ª ××¡×¨×× ××××××"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "×¢××× ×× ××× × ×××× ××¡×× ×××× ×©××ª× ×××× ××§××"
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "××ª×××ª ××¡×¨×× ××××××"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr ""
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "××©×¨"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "××¢××¤××ª"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "××¢××¤××ª × ×©××¨×."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr ""
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr ""
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr "×§×× ××××©××¨ ××× ××× × ××××¢× ××!"
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "××××©××¨ ××××."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr ""
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "×××ª×××ª ×××¡×¨×."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr ""
 
@@ -5200,10 +5423,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "×××"
 
@@ -5281,35 +5502,41 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "××× ×¤×¨××¤×× ×ª××× ××¤×¨××¤×× ×××¨×××§ "
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 #, fuzzy
 msgid "User has no last notice"
 msgstr "×××©×ª××© ××× ×¤×¨××¤××."
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "×¢××××× ×××©×ª××© × ××©×."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "×¢××××× ×××©×ª××© × ××©×."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "×ª××××ª ×¢×××¨ %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5317,204 +5544,208 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "×××¨ × ×× ×¡×ª ×××¢×¨××ª!"
 
-#: lib/command.php:331
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
 msgstr "× ××©×× ×××¤× ×× ××©×¨×ª: %s"
 
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
 #, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "××¡××××¡ ×©× %1$s ×-%2$s "
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
 msgstr "× ××©×× ××¦××¨×ª OpenID ××ª××: %s"
 
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "××¡××××¡ ×©× %1$s ×-%2$s "
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, fuzzy, php-format
 msgid "Fullname: %s"
 msgstr "×©× ×××"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "×××××ª: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "×× × ××ª× ××××¨×©× ××× ××¡××× ××¨×©×××"
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "×××¨ × ×× ×¡×ª ×××¢×¨××ª!"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "××××¢××ª"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "××¢×× ××©×××¨×ª ×××××¢×."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "×ª××××ª ×¢×××¨ %s"
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "××¢×× ××©×××¨×ª ×××××¢×."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "××× ×× ××"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 msgstr[1] "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "××¨×©×× ××¨×××§×ª"
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "××¨×©×× ××¨×××§×ª"
 msgstr[1] "××¨×©×× ××¨×××§×ª"
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 msgstr[1] "×× ×©××× × ×××× × ××ª ××¤×¨××¤×× ×××"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6372,6 +6603,10 @@ msgstr "××× ××¡×× ×××."
 msgid "Repeat this notice?"
 msgstr "××× ××××¢× ×××."
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "××"
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6571,47 +6806,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "××¤× × ××¡×¤×¨ ×©× ×××ª"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "××¤× × ×××§×"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "××¤× × ×-%d ××§××ª"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "××¤× × ××©×¢×"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "××¤× × ×-%d ×©×¢××ª"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "××¤× × ××××"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "××¤× × ×-%d ××××"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "××¤× × ×××××©"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "××¤× × ×-%d ××××©××"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "××¤× × ××©× ×"
 
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index c7afc53d2d..3944af266b 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:09+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:55+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: out-statusnet\n"
@@ -73,8 +73,13 @@ msgstr "ZaÄinjeny"
 msgid "Save access settings"
 msgstr "PÅistupne nastajenja skÅadowaÄ"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "SkÅadowaÄ"
@@ -105,7 +110,7 @@ msgstr "Strona njeeksistuje"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "WuÅ¾iwar njeeksistuje"
@@ -334,7 +339,7 @@ msgstr "Status z tym ID njenamakany."
 msgid "This status is already a favorite."
 msgstr "TutÃ³n status je hiÅ¾o faworit."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr ""
 
@@ -451,7 +456,7 @@ msgstr "Skupina njenamakana!"
 msgid "You are already a member of that group."
 msgstr "Sy hiÅ¾o ÄÅon teje skupiny."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -502,17 +507,17 @@ msgid "Invalid token."
 msgstr "NjepÅaÄiwy token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -543,12 +548,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -801,27 +809,44 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "NÄ"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Tutoho wuÅ¾iwarja njeblokowaÄ"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Haj"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Tutoho wuÅ¾iwarja blokowaÄ"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr ""
 
@@ -834,8 +859,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Skupina njeeksistuje."
 
@@ -894,16 +919,24 @@ msgstr "NjespÃ³znany adresowy typ %s"
 msgid "That address has already been confirmed."
 msgstr "Tuta adresa bu hiÅ¾o wobkruÄena."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr ""
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
@@ -955,11 +988,13 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Tutu aplikaciju njezniÄiÄ"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Tutu aplikaciju zniÄiÄ"
 
@@ -992,11 +1027,13 @@ msgstr "ZdÅºÄlenku wuÅ¡mÃ³rnyÄ"
 msgid "Are you sure you want to delete this notice?"
 msgstr "ChceÅ¡ woprawdÅºe tutu zdÅºÄlenku wuÅ¡mÃ³rnyÄ?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Tutu zdÅºÄlenku njewuÅ¡mÃ³rnyÄ"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Tutu zdÅºÄlenku wuÅ¡mÃ³rnyÄ"
 
@@ -1018,7 +1055,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Tutoho wuÅ¾iwarja wuÅ¡mÃ³rnyÄ"
 
@@ -1130,15 +1168,13 @@ msgid "Reset back to default"
 msgstr "Na standard wrÃ³Äo stajiÄ"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "SkÅadowaÄ"
 
@@ -1264,178 +1300,238 @@ msgstr "Aliasy njejsu so dali wutworiÄ."
 msgid "Options saved."
 msgstr "Opcije skÅadowane."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "E-mejlowe nastajenja"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresa"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-mejlowa adresa"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Aktualna wobkruÄena e-mejlowa adresa."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "WotstroniÄ"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "PÅetorhnyÄ"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-mejlowa adresa"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mejlowa adresa, kaÅ¾ na pÅ. \"WuÅ¾iwarskeMjeno@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "PÅidaÄ"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "DochadÅºaca e-mejl"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowy"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Nastajenja"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Chcu zdÅºÄlenki pÅez e-mejl pÃ³sÅaÄ."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "MicroID za moju e-mejlowu adresu publikowaÄ"
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Nastajenja skÅadowane."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Designowe nastajenja skÅadowane."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Å½ana e-mejlowa adresa."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "NjepÅaÄiwa e-mejlowa adresa."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "To je hiÅ¾o twoja e-mejlowa adresa."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Ta e-mejlowa adresa hiÅ¾o sÅuÅ¡a k druhemu wuÅ¾iwarjej."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "to je wopaÄna IM-adresa."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "WobkruÄenje pÅetorhnjene."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "To njeje twoja e-mejlowa adresa."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Adresa bu wotstronjena."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Å½ana adresa za dochadÅºace e-mejle."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr ""
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Adresa za dochadÅºaÄe e-mejle wotstronjena."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nowa adresa za dochadÅºace e-mejle pÅidata."
 
@@ -1618,15 +1714,17 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Tutoho wuÅ¾iwarja za tutu skupinu blokowaÄ"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Tutoho wuÅ¾iwarja za tutu skupinu blokowaÄ"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1796,90 +1894,148 @@ msgstr ""
 msgid "Error removing the block."
 msgstr ""
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "IM-nastajenja"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "IM k dispoziciji njesteji."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM-adresa"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM-adresa"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Nastajenja"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Nastajenja skÅadowane."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Å½adyn ID Jabber."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "NjepÅaÄiwy ID Jabber"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "To je hiÅ¾o twÃ³j ID Jabber."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "to je wopaÄna IM-adresa."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Abonoment njeje so daÅ zniÄiÄ."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "WobkruÄenje pÅetorhnjene."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "To njeje twÃ³j ID Jabber."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Adresa bu wotstronjena."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1920,7 +2076,9 @@ msgstr "Nowych wuÅ¾iwarjow pÅeprosyÄ"
 msgid "You are already subscribed to these users:"
 msgstr "Sy tutych wuÅ¾iwarjow hiÅ¾o abonowaÅ:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2015,7 +2173,9 @@ msgstr ""
 msgid "No nickname or ID."
 msgstr "Å½ane pÅimjeno abo Å¾adyn ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
@@ -2024,11 +2184,13 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr "DyrbiÅ¡ pÅizjewjeny byÄ, zo by skupinu wopuÅ¡ÄiÅ."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "Njejsy ÄÅon teje skupiny."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr ""
@@ -2134,12 +2296,12 @@ msgstr "WuÅ¾ij tutÃ³n formular, zo by nowu skupinu wutworiÅ."
 msgid "New message"
 msgstr "Nowa powÄsÄ"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "NjemÃ³Å¾eÅ¡ tutomu wuÅ¾iwarju powÄsÄ pÃ³sÅaÄ."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Å½adyn wobsah!"
 
@@ -2147,7 +2309,7 @@ msgstr "Å½adyn wobsah!"
 msgid "No recipient specified."
 msgstr "Å½adyn pÅijimowar podaty."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2395,7 +2557,7 @@ msgid "6 or more characters"
 msgstr "6 abo wjace znamjeÅ¡kow"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "WobkruÄiÄ"
 
@@ -3691,95 +3853,156 @@ msgstr ""
 msgid "Save site notice"
 msgstr "SydÅowu zdÅºÄlenku skÅadowaÄ"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "SMS-nastajenja"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "SMS k dispoziciji njesteji."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM-adresa"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr ""
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "WobkruÄiÄ"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "SMS telefonowe ÄisÅo"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Nastajenja"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Nastajenja skÅadowane."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Å½ane telefonowe ÄisÅo."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "To je hiÅ¾o twoje telefonowe ÄisÅo."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Te telefonowe ÄisÅo hiÅ¾o druhemu wuÅ¾iwarjej sÅuÅ¡a."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "WobkruÄenje pÅetorhnjene."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr ""
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS telefonowe ÄisÅo"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Å½adyn kod zapodaty"
 
@@ -4920,10 +5143,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "PÅetorhnyÄ"
 
@@ -4997,34 +5218,40 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "ZdÅºÄlenka z tym ID njeeksistuje"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "WuÅ¾iwar nima poslednju powÄsÄ"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr ""
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr ""
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr ""
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5032,169 +5259,173 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Sy hiÅ¾o ÄÅon teje skupiny"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "NjebÄ mÃ³Å¾no wuÅ¾iwarja %s skupinje %s pÅidaÄ"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s je so k skupinje %s pÅizamknyÅ"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "NjebÄ mÃ³Å¾no wuÅ¾iwarja %1$s skupinje %2%s pÅidaÄ."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "NjebÄ mÃ³Å¾no wuÅ¾iwarja %s do skupiny %s pÅesunyÄ"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s je skupinu %s wopuÅ¡ÄiÅ"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "DospoÅne mjeno: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "MÄstno: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Wo: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Direktna powÄsÄ do %s pÃ³sÅana"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "NjemÃ³Å¾eÅ¡ swÃ³jsku powÄsÄ wospjetowaÄ"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "Tuta zdÅºÄlenka bu hiÅ¾o wospjetowana"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "ZdÅºÄlenka wot %s wospjetowana"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Zmylk pÅi wospjetowanju zdÅºÄlenki"
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "WotmoÅwa na %s pÃ³sÅana"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr ""
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "OMB-profile njedadÅºa so pÅez pÅikaz abonowaÄ."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "%s wotskazany"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr ""
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Sy tutu wosobu abonowaÅ:"
@@ -5202,11 +5433,11 @@ msgstr[1] "Sy tutej wosobje abonowaÅ:"
 msgstr[2] "Sy tute wosoby abonowaÅ:"
 msgstr[3] "Sy tute wosoby abonowaÅ:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr ""
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Tuta wosoba je Äe abonowaÅa:"
@@ -5214,11 +5445,11 @@ msgstr[1] "Tutej wosobje stej Äe abonowaÅoj:"
 msgstr[2] "Tute wosoby su Äe abonowali:"
 msgstr[3] "Tute wosoby su Äe abonowali:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr ""
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sy ÄÅon tuteje skupiny:"
@@ -5226,7 +5457,7 @@ msgstr[1] "Sy ÄÅon tuteju skupinow:"
 msgstr[2] "Sy ÄÅon tutych skupinow:"
 msgstr[3] "Sy ÄÅon tutych skupinow:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6047,6 +6278,10 @@ msgstr "Å½ane wrÃ³Äenske argumenty."
 msgid "Repeat this notice?"
 msgstr "Tutu zdÅºÄlenku wospjetowaÄ?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Haj"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Tutu zdÅºÄlenku wospjetowaÄ"
@@ -6233,47 +6468,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "pÅed nÄÅ¡to sekundami"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "pÅed nÄhdÅºe jednej mjeÅÅ¡inu"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "pÅed %d mjeÅÅ¡inami"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "pÅed nÄhdÅºe jednej hodÅºinu"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "pÅed nÄhdÅºe %d hodÅºinami"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "pÅed nÄhdÅºe jednym dnjom"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "pÅed nÄhdÅºe %d dnjemi"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "pÅed nÄhdÅºe jednym mÄsacom"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "pÅed nÄhdÅºe %d mÄsacami"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "pÅed nÄhdÅºe jednym lÄtom"
 
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index 0d9bf1bce8..1137731c78 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:14+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:43:58+0000\n"
 "Language-Team: Interlingua\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: out-statusnet\n"
@@ -71,8 +71,13 @@ msgstr "Claudite"
 msgid "Save access settings"
 msgstr "Salveguardar configurationes de accesso"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salveguardar"
@@ -103,7 +108,7 @@ msgstr "Pagina non existe"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Usator non existe."
@@ -345,7 +350,7 @@ msgstr "Nulle stato trovate con iste ID."
 msgid "This status is already a favorite."
 msgstr "Iste stato es ja favorite."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Non poteva crear le favorite."
 
@@ -462,7 +467,7 @@ msgstr "Gruppo non trovate!"
 msgid "You are already a member of that group."
 msgstr "Tu es ja membro de iste gruppo."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "Le administrator te ha blocate de iste gruppo."
 
@@ -513,17 +518,17 @@ msgid "Invalid token."
 msgstr "Indicio invalide."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -559,12 +564,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "Le indicio de requesta %s ha essite refusate e revocate."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Submission de formulario inexpectate."
 
@@ -827,27 +835,44 @@ msgstr ""
 "cancellate, ille non potera resubscriber se a te in le futuro, e tu non "
 "recipera notification de su @-responsas."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Non blocar iste usator"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Si"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Blocar iste usator"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Falleva de salveguardar le information del blocada."
 
@@ -860,8 +885,8 @@ msgstr "Falleva de salveguardar le information del blocada."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Gruppo non existe."
 
@@ -920,16 +945,24 @@ msgstr "Typo de adresse %s non recognoscite"
 msgid "That address has already been confirmed."
 msgstr "Iste adresse ha ja essite confirmate."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Non poteva actualisar usator."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Non poteva deler confirmation de e-mail."
 
@@ -984,11 +1017,13 @@ msgstr ""
 "le application del base de datos, includente tote le existente connexiones "
 "de usator."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Non deler iste application"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Deler iste application"
 
@@ -1023,11 +1058,13 @@ msgstr "Deler nota"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Es tu secur de voler deler iste nota?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Non deler iste nota"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Deler iste nota"
 
@@ -1051,7 +1088,8 @@ msgstr ""
 "Es tu secur de voler deler iste usator? Isto radera tote le datos super le "
 "usator del base de datos, sin copia de reserva."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Deler iste usator"
 
@@ -1164,15 +1202,13 @@ msgid "Reset back to default"
 msgstr "Revenir al predefinitiones"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Salveguardar"
 
@@ -1298,31 +1334,43 @@ msgstr "Non poteva crear aliases."
 msgid "Options saved."
 msgstr "Optiones salveguardate."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "Configuration de e-mail"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Configurar como reciper e-mail de %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresse"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Adresse de e-mail"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Adresse de e-mail actualmente confirmate."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1330,107 +1378,142 @@ msgstr ""
 "Attende confirmation de iste adresse. Verifica tu cassa de entrata (e de "
 "spam!) pro un message con ulterior instructiones."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancellar"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Adresse de e-mail"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Le adresse de e-mail, como \"nomine@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Adder"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "E-mail entrante"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Invia e-mail a iste adresse pro publicar nove notas."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Face un nove adresse de e-mail per le qual publicar; cancella le vetule."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Nove"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Preferentias"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Inviar me notificationes de nove subscriptiones per e-mail."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Inviar me e-mail quando alcuno adde mi nota al favorites."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Inviar me e-mail quando alcuno me invia un message private."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Inviar me e-mail quando alcuno me invia un \"responsa @\"."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitte que amicos me pulsa e me invia e-mail."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Io vole publicar notas per e-mail."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar un MicroID pro mi adresse de e-mail."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Preferentias confirmate."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Preferentias de apparentia salveguardate."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Nulle adresse de e-mail."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Non pote normalisar iste adresse de e-mail"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Adresse de e-mail invalide."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Isto es ja tu adresse de e-mail."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Iste adresse de e-mail pertine ja a un altere usator."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Non poteva inserer le codice de confirmation."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1439,43 +1522,56 @@ msgstr ""
 "addeva. Verifica tu cassa de entrata (e de spam!) pro le codice e le "
 "instructiones pro usar lo."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Nulle confirmation pendente a cancellar."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Iste adresse de messageria instantanee es erronee."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Confirmation cancellate."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Isto non es tu adresse de e-mail."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Le adresse ha essite removite."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Nulle adresse de e-mail entrante."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Non poteva actualisar le datos del usator."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Adresse de e-mail entrante removite."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nove adresse de e-mail entrante addite."
 
@@ -1666,15 +1762,17 @@ msgstr ""
 "essera removite del gruppo, non potera publicar messages, e non potera "
 "subscriber se al gruppo in le futuro."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Non blocar iste usator de iste gruppo"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Blocar iste usator de iste gruppo"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "Error del base de datos al blocar le usator del gruppo."
 
@@ -1857,11 +1955,15 @@ msgstr "Le usator non es blocate del gruppo."
 msgid "Error removing the block."
 msgstr "Error de remover le blocada."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "Configuration de messageria instantanee"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1870,15 +1972,24 @@ msgstr ""
 "Tu pote inviar e reciper notas per [messages instantanee](%%doc.im%%) de "
 "Jabber/GTalk. Configura tu adresse e parametros hic infra."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "Messageria instantanee non disponibile."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Adresse de messageria instantanee"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Adresse Jabber/GTalk actualmente confirmate."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1887,11 +1998,9 @@ msgstr ""
 "Attende confirmation de iste adresse. Verifica tu conto Jabber/GTalk pro un "
 "message con ulterior instructiones. (Ha tu addite %s a tu lista de amicos?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Adresse de messageria instantanee"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1901,45 +2010,67 @@ msgstr ""
 "de adder %s a tu lista de amicos in tu cliente de messageria instantanee o "
 "in GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferentias"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Inviar me notas per Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar un nota quando mi stato de Jabber/GTalk cambia."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Inviar me responsas per Jabber/GTalk de personas al quales io non es "
 "subscribite."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar un MicroID pro mi adresse Jabber/GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Preferentias confirmate."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Nulle ID de Jabber."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Non pote normalisar iste ID de Jabber"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "ID de Jabber non valide"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Isto es ja tu ID de Jabber."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Le ID de Jabber pertine ja a un altere usator."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1948,10 +2079,35 @@ msgstr ""
 "Un codice de confirmation ha essite inviate al adresse de messageria "
 "instantanee specificate. Tu debe approbar que %s invia messages a te."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Iste adresse de messageria instantanee es erronee."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Non poteva deler confirmation de e-mail."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Confirmation cancellate."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Isto non es tu ID de Jabber."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Le adresse ha essite removite."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1994,7 +2150,9 @@ msgstr "Invitar nove usatores"
 msgid "You are already subscribed to these users:"
 msgstr "Tu es a subscribite a iste usatores:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2118,7 +2276,9 @@ msgstr "Tu debe aperir un session pro facer te membro de un gruppo."
 msgid "No nickname or ID."
 msgstr "Nulle pseudonymo o ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s es ora membro del gruppo %2$s"
@@ -2127,11 +2287,13 @@ msgstr "%1$s es ora membro del gruppo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Tu debe aperir un session pro quitar un gruppo."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "Tu non es membro de iste gruppo."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s quitava le gruppo %2$s"
@@ -2244,12 +2406,12 @@ msgstr "Usa iste formulario pro crear un nove gruppo."
 msgid "New message"
 msgstr "Nove message"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Tu non pote inviar un message a iste usator."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Nulle contento!"
 
@@ -2257,7 +2419,7 @@ msgstr "Nulle contento!"
 msgid "No recipient specified."
 msgstr "Nulle destinatario specificate."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2519,7 +2681,7 @@ msgid "6 or more characters"
 msgstr "6 o plus characteres"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -3913,44 +4075,74 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Salveguardar aviso del sito"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "Parametros de SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Tu pote reciper messages SMS per e-mail ab %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "SMS non es disponibile."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Adresse de messageria instantanee"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Numero de telephono actual e confirmate con servicio SMS."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Iste numero de telephono attende confirmation."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Codice de confirmation"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Entra le codice que tu ha recipite in tu telephono."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "Numero de telephono pro SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Numero de telephono, sin punctuation o spatios, con indicativo"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferentias"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3958,23 +4150,34 @@ msgstr ""
 "Invia me notas per SMS; io comprende que io pote incurrer exorbitante costos "
 "de mi operator."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Preferentias confirmate."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Nulle numero de telephono."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Nulle operator seligite."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Isto es ja tu numero de telephono."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Iste numero de telephono pertine ja a un altere usator."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -3982,23 +4185,42 @@ msgstr ""
 "Un codice de confirmation ha essite inviate al numero de telephono que tu ha "
 "addite. Vide in tu telephono le codice e le instructiones super como usar lo."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Iste codice de confirmation es incorrecte."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Confirmation cancellate."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Isto non es tu numero de telephono."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Numero de telephono pro SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Operator de telephonia mobile"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Selige un operator"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4008,7 +4230,8 @@ msgstr ""
 "que accepta SMS via e-mail ma non es listate hic, invia e-mail pro informar "
 "nos a %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Nulle codice entrate"
 
@@ -5208,10 +5431,8 @@ msgstr ""
 "Accesso predefinite pro iste application: lectura solmente, o lectura e "
 "scriptura"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Cancellar"
 
@@ -5287,34 +5508,40 @@ msgstr "Commando fallite"
 msgid "Notice with that id does not exist"
 msgstr "Non existe un nota con iste ID"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "Usator non ha ultime nota"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Non poteva trovar un usator con pseudonymo %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Non poteva trovar un usator local con pseudonymo %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Pardono, iste commando non es ancora implementate."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Non ha multe senso pulsar te mesme!"
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Pulsata inviate a %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5325,57 +5552,55 @@ msgstr ""
 "Subscriptores: %2$s\n"
 "Notas: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Nota marcate como favorite."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Tu es ja membro de iste gruppo"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Non poteva facer le usator %s membro del gruppo %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s se faceva membro del gruppo %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "Non poteva remover le usator %s del gruppo %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s quitava le gruppo %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nomine complete: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Loco: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina personal: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "A proposito: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5384,140 +5609,146 @@ msgstr ""
 "%s es un profilo remote; tu pote solmente inviar messages directe a usatores "
 "super le mesme servitor."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Message troppo longe - maximo es %d characteres, tu inviava %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Message directe a %s inviate"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Error durante le invio del message directe."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "Non pote repeter tu proprie nota"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "Iste nota ha ja essite repetite"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Nota de %s repetite"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Error durante le repetition del nota."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Nota troppo longe - maximo es %d characteres, tu inviava %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Responsa a %s inviate"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Errur durante le salveguarda del nota."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Specifica le nomine del usator al qual subscriber te"
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossibile subscriber se a profilos OMB per medio de un commando."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Subscribite a %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Specifica le nomine del usator al qual cancellar le subscription"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Subscription a %s cancellate"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Commando non ancora implementate."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Notification disactivate."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "Non pote disactivar notification."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Notification activate."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Non pote activar notification."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "Le commando de apertura de session es disactivate"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 "Iste ligamine pote esser usate solmente un vice, e es valide durante "
 "solmente 2 minutas: %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "Subscription de %s cancellate"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "Tu non es subscribite a alcuno."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Tu es subscribite a iste persona:"
 msgstr[1] "Tu es subscribite a iste personas:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "Necuno es subscribite a te."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Iste persona es subscribite a te:"
 msgstr[1] "Iste personas es subscribite a te:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "Tu non es membro de alcun gruppo."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Tu es membro de iste gruppo:"
 msgstr[1] "Tu es membro de iste gruppos:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6461,6 +6692,10 @@ msgstr "Nulle parametro return-to."
 msgid "Repeat this notice?"
 msgstr "Repeter iste nota?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Si"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repeter iste nota"
@@ -6647,47 +6882,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "alcun secundas retro"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "circa un minuta retro"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "circa %d minutas retro"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "circa un hora retro"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "circa %d horas retro"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "circa un die retro"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "circa %d dies retro"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "circa un mense retro"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "circa %d menses retro"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "circa un anno retro"
 
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 135a7d2b7a..49e737db85 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:20+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:02+0000\n"
 "Language-Team: Icelandic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: out-statusnet\n"
@@ -79,8 +79,13 @@ msgstr ""
 msgid "Save access settings"
 msgstr "Stillingar fyrir mynd"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -112,7 +117,7 @@ msgstr "Ekkert Ã¾annig merki."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Enginn svoleiÃ°is notandi."
@@ -347,7 +352,7 @@ msgstr "Engin staÃ°a fundin meÃ° Ã¾essu kenni."
 msgid "This status is already a favorite."
 msgstr "Ãetta babl er nÃº Ã¾egar Ã uppÃ¡haldi!"
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Gat ekki bÃºiÃ° til uppÃ¡hald."
 
@@ -469,7 +474,7 @@ msgstr "AÃ°ferÃ° Ã forritsskilum fannst ekki!"
 msgid "You are already a member of that group."
 msgstr "ÃÃº ert nÃº Ã¾egar meÃ°limur Ã Ã¾essum hÃ³pi"
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -522,17 +527,17 @@ msgid "Invalid token."
 msgstr "ÃtÃ¦k stÃ¦rÃ°."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -566,12 +571,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "BjÃ³st ekki viÃ° innsendingu eyÃ°ublaÃ°s."
 
@@ -831,28 +839,45 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Nei"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 #, fuzzy
 msgid "Do not block this user"
 msgstr "Opna Ã¡ Ã¾ennan notanda"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "JÃ¡"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Loka Ã¡ Ã¾ennan notanda"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "MistÃ³kst aÃ° vista upplÃ½singar um notendalokun"
 
@@ -865,8 +890,8 @@ msgstr "MistÃ³kst aÃ° vista upplÃ½singar um notendalokun"
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Enginn Ã¾annig hÃ³pur."
 
@@ -925,16 +950,24 @@ msgstr "ÃÃ¾ekkt gerÃ° tÃ¶lvupÃ³stfangs %s"
 msgid "That address has already been confirmed."
 msgstr "Ãetta tÃ¶lvupÃ³stfang hefur nÃº Ã¾egar veriÃ° staÃ°fest."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Gat ekki uppfÃ¦rt notanda."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Gat ekki eytt tÃ¶lvupÃ³stsstaÃ°festingu."
 
@@ -992,12 +1025,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "Gat ekki uppfÃ¦rt hÃ³p."
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "EyÃ°a Ã¾essu babli"
@@ -1031,11 +1066,13 @@ msgstr "EyÃ°a babli"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ertu viss um aÃ° Ã¾Ãº viljir eyÃ°a Ã¾essu babli?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr ""
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "EyÃ°a Ã¾essu babli"
 
@@ -1060,7 +1097,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 #, fuzzy
 msgid "Delete this user"
 msgstr "EyÃ°a Ã¾essu babli"
@@ -1178,15 +1216,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Vista"
 
@@ -1324,32 +1360,45 @@ msgstr ""
 msgid "Options saved."
 msgstr "ValmÃ¶guleikar vistaÃ°ir."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "TÃ¶lvupÃ³stsstillingar"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Stilla Ã¾aÃ° hvernig Ã¾Ãº fÃ¦rÃ° tÃ¶lvupÃ³st frÃ¡ %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "TÃ¶lvupÃ³stfang"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "TÃ¶lvupÃ³stfÃ¶ng"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "NÃºverandi staÃ°festa tÃ¶lvupÃ³stfangiÃ°."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "FjarlÃ¦gja"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1357,107 +1406,141 @@ msgstr ""
 "BÃ½Ã° eftir staÃ°festingu frÃ¡ Ã¾essu netfangi. AthugaÃ°u innhÃ³lfiÃ° Ã¾itt (og "
 "ruslpÃ³stinn Ã¾inn!). Ãar Ã¦ttu aÃ° vera skilaboÃ° meÃ° Ãtarlegri leiÃ°beiningum."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "HÃ¦tta viÃ°"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "TÃ¶lvupÃ³stfÃ¶ng"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "TÃ¶lvupÃ³stfang eins og \"notandi@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "BÃ¦ta viÃ°"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "MÃ³ttÃ¶kutÃ¶lvupÃ³stur"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Sendu tÃ¶lvupÃ³st Ã¡ Ã¾etta pÃ³stfang til Ã¾ess aÃ° senda inn nÃ½tt babl."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "BÃºa til nÃ½tt tÃ¶lvupÃ³stfang til aÃ° senda til. Skrifar yfir Ã¾aÃ° gamla."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "NÃ½tt"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Stillingar"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Sendu mÃ©r tilkynningu varÃ°andi nÃ½jar Ã¡skriftir Ã gegnum tÃ¶lvupÃ³st."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Senda mÃ©r tÃ¶lvupÃ³st Ã¾egar einhver setur babl Ã mÃ©r Ã uppÃ¡hald hjÃ¡ sÃ©r."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Senda mÃ©r tÃ¶lvupÃ³st Ã¾egar einhver sendir mÃ©r persÃ³nuleg skilaboÃ°."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Leyfa vinum aÃ° Ã½ta viÃ° mÃ©r og senda mÃ©r tÃ¶lvupÃ³st."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Ãg vil babla Ã gegnum tÃ¶lvupÃ³st."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Birta MicroID fyrir tÃ¶lvupÃ³stfangiÃ° mitt."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "Stillingar vistaÃ°ar."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Ekkert tÃ¶lvupÃ³stfang."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Get ekki staÃ°laÃ° Ã¾etta tÃ¶lvupÃ³stfang"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ekki tÃ¦kt tÃ¶lvupÃ³stfang."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Ãetta er nÃº Ã¾egar tÃ¶lvupÃ³stfangiÃ° Ã¾itt."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Ãetta tÃ¶lvupÃ³stfang tilheyrir Ã¶Ã°rum notanda."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Gat ekki sett inn staÃ°festingarlykil."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1466,43 +1549,56 @@ msgstr ""
 "AthugaÃ°u innhÃ³lfiÃ° Ã¾itt (og ruslpÃ³stinn Ã¾inn!). Ãar Ã¦tti "
 "staÃ°festingarlykillinn aÃ° vera og leiÃ°beingar um hvernig eigi aÃ° nota hann. "
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Engin staÃ°festing Ã biÃ° sem Ã¾arf aÃ° hÃ¦tta viÃ°."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Ãetta er rangt snarskilaboÃ°afang."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "HÃ¦tt viÃ° staÃ°festingu."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Ãetta er ekki tÃ¶lvupÃ³stfangiÃ° Ã¾itt."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "TÃ¶lvupÃ³stfangiÃ° hefur veriÃ° fjarlÃ¦gt."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Ekkert mÃ³ttÃ¶kutÃ¶lvupÃ³stfang."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Gat ekki uppfÃ¦rt skrÃ¡arfÃ¦rslu notanda."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "MÃ³ttÃ¶kutÃ¶lvupÃ³stfang fjarlÃ¦gt."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "NÃ½ju mÃ³ttÃ¶kutÃ¶lvupÃ³stfangi bÃ¦tt viÃ°."
 
@@ -1697,15 +1793,17 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr ""
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr ""
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1874,12 +1972,16 @@ msgstr ""
 msgid "Error removing the block."
 msgstr "Vill kom upp viÃ° aÃ° aflÃ©tta notendalokun."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "SnarskilaboÃ°astillingar"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1889,16 +1991,26 @@ msgstr ""
 "[snarskilaboÃ°aÃ¾jÃ³nustuna](%%doc.im%%). Settu upp netfangiÃ° Ã¾itt hÃ©r fyrir "
 "neÃ°an og stilltu notkunina."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 #, fuzzy
 msgid "IM is not available."
 msgstr "Ãessi sÃÃ°a er ekki aÃ°gengileg Ã "
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "SnarskilaboÃ°afang"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "NÃºverandi staÃ°festa Jabber/GTalk snarskilaboÃ°afangiÃ°."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1908,12 +2020,9 @@ msgstr ""
 "Ã¾inn. Ãar Ã¦ttu aÃ° vera skilaboÃ° meÃ° Ãtarlegri leiÃ°beiningum. (HefurÃ°u bÃ¦tt %"
 "s viÃ° Ã vinalistann Ã¾inn?)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "SnarskilaboÃ°afang"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1923,44 +2032,66 @@ msgstr ""
 "viss um aÃ° bÃ¦ta %s viÃ° Ã vinalistann Ã¾inn Ã snarskilaboÃ°aforritinu Ã¾Ãnu eÃ°a "
 "Ã¡ GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Stillingar"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Sendur mÃ©r babl Ã gegnum Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Senda inn babl Ã¾egar Jabber/GTalk staÃ°an breytist."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Sendu mÃ©r svÃ¶r Ã gegnum Jabber/GTalk frÃ¡ fÃ³lki sem Ã©g er ekki Ã¡skrifandi aÃ°."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Birta MicroID fyrir Jabber/GTalk netfangiÃ° mitt."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Stillingar vistaÃ°ar."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Ekkert Jabber-kenni"
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Get ekki staÃ°laÃ° Ã¾etta Jabber kenni"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Ekki tÃ¦kt Jabber-kenni"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Ãetta er nÃº Ã¾egar Jabber-kenniÃ° Ã¾itt."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-kenniÃ° tilheyrir Ã¶Ã°rum notanda."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1969,10 +2100,35 @@ msgstr ""
 "StaÃ°festingarlykill var sendur Ã¡ snarskilaboÃ°afangiÃ° sem Ã¾Ãº varst aÃ° bÃ¦ta "
 "viÃ°. ÃÃº verÃ°ur aÃ° leyfa %s aÃ° senda snarskilaboÃ° til Ã¾Ãn."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Ãetta er rangt snarskilaboÃ°afang."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Gat ekki eytt tÃ¶lvupÃ³stsstaÃ°festingu."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "HÃ¦tt viÃ° staÃ°festingu."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Ãetta er ekki Jabber-kenniÃ° Ã¾itt."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "TÃ¶lvupÃ³stfangiÃ° hefur veriÃ° fjarlÃ¦gt."
+
 #: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2014,7 +2170,9 @@ msgstr "BjÃ³Ã°a nÃ½jum notendum aÃ° vera meÃ°"
 msgid "You are already subscribed to these users:"
 msgstr "ÃÃº ert nÃº Ã¾egar Ã Ã¡skrift aÃ° Ã¾essum notendum:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2140,7 +2298,9 @@ msgstr "ÃÃº verÃ°ur aÃ° hafa skrÃ¡Ã° Ã¾ig inn til aÃ° bÃ¦ta Ã¾Ã©r Ã hÃ³p."
 msgid "No nickname or ID."
 msgstr "Ekkert stuttnefni."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, fuzzy, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%s bÃ¦tti sÃ©r Ã hÃ³pinn %s"
@@ -2149,11 +2309,13 @@ msgstr "%s bÃ¦tti sÃ©r Ã hÃ³pinn %s"
 msgid "You must be logged in to leave a group."
 msgstr "ÃÃº verÃ°ur aÃ°a hafa skrÃ¡Ã° Ã¾ig inn til aÃ° ganga Ãºr hÃ³p."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "ÃÃº ert ekki meÃ°limur Ã Ã¾essum hÃ³pi."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%s gekk Ãºr hÃ³pnum %s"
@@ -2271,12 +2433,12 @@ msgstr "NotaÃ°u Ã¾etta eyÃ°ublaÃ° til aÃ° bÃºa til nÃ½jan hÃ³p."
 msgid "New message"
 msgstr "NÃ½ skilaboÃ°"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "ÃÃº getur ekki sent Ã¾essum notanda skilaboÃ°."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Ekkert innihald!"
 
@@ -2284,7 +2446,7 @@ msgstr "Ekkert innihald!"
 msgid "No recipient specified."
 msgstr "Enginn mÃ³ttÃ¶kuaÃ°ili tilgreindur."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2549,7 +2711,7 @@ msgid "6 or more characters"
 msgstr "6 eÃ°a fleiri tÃ¡kn"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "StaÃ°festa"
 
@@ -3925,47 +4087,77 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Babl vefsÃÃ°unnar"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "SMS stillingar"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "ÃÃº getur fengiÃ° SMS Ã gegnum tÃ¶lvupÃ³st frÃ¡ %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Ãessi sÃÃ°a er ekki aÃ°gengileg Ã "
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "SnarskilaboÃ°afang"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "NÃºverandi staÃ°festa SMS sÃmanÃºmeriÃ°."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "BÃ½Ã° eftir staÃ°festingu varÃ°andi Ã¾etta sÃmanÃºmer."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "StaÃ°festingarlykill"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "SlÃ¡Ã°u inn lykilinn sem Ã¾Ãº fÃ©kkst Ã sÃmann Ã¾inn."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "StaÃ°festa"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 #, fuzzy
 msgid "SMS phone number"
 msgstr "SMS sÃmanÃºmer"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "SÃmanÃºmer, meÃ° svÃ¦Ã°isnÃºmeri ef viÃ° Ã¡, Ã¡n greinarmerkja eÃ°a bila"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Stillingar"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3973,45 +4165,75 @@ msgstr ""
 "Sendu mÃ©r babl Ã gegnum SMS. Ãg veit aÃ° Ã¾aÃ° er mÃ¶guleiki aÃ° "
 "farsÃmafyrirtÃ¦kiÃ° rukki fyrir mÃ³ttÃ¶ku Ã¡ SMSunum."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Stillingar vistaÃ°ar."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Ekkert sÃmanÃºmer."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Ekkert farsÃmafÃ©lag valiÃ°."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Ãetta er nÃº Ã¾egar sÃmanÃºmeriÃ° Ã¾itt."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Ãetta sÃmanÃºmer tilheyri nÃº Ã¾egar Ã¶Ã°rum notanda."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Ãetta er rangur staÃ°festingarlykill."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "HÃ¦tt viÃ° staÃ°festingu."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Ãetta er ekki sÃmanÃºmeriÃ° Ã¾itt."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS sÃmanÃºmer"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "FarsÃmafyrirtÃ¦ki"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Veldu farsÃmafyrirtÃ¦ki"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4021,7 +4243,8 @@ msgstr ""
 "gegnum tÃ¶lvupÃ³st sem er ekki Ã Ã¾essum lista, sendu okkur tÃ¶lvupÃ³st Ã %s og "
 "lÃ¡ttu okkur vita."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Enginn lykill sleginn inn"
 
@@ -5253,10 +5476,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "HÃ¦tta viÃ°"
 
@@ -5333,34 +5554,40 @@ msgstr "MisheppnuÃ° skipun"
 msgid "Notice with that id does not exist"
 msgstr "Enginn persÃ³nuleg sÃÃ°a meÃ° Ã¾essu einkenni."
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "Notandi hefur ekkert nÃ½tt babl"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Gat ekki uppfÃ¦rt notanda meÃ° staÃ°festu tÃ¶lvupÃ³stfangi."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Gat ekki uppfÃ¦rt notanda meÃ° staÃ°festu tÃ¶lvupÃ³stfangi."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "FyrirgefÃ°u en Ã¾essi skipun hefur ekki enn veriÃ° ÃºtbÃºin."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "Ãtt viÃ° notanda"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5368,203 +5595,207 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Babl gert aÃ° uppÃ¡haldi."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "ÃÃº ert nÃº Ã¾egar meÃ°limur Ã Ã¾essum hÃ³pi"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
 msgstr "Gat ekki bÃ¦tt notandanum %s Ã hÃ³pinn %s"
 
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s bÃ¦tti sÃ©r Ã hÃ³pinn %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "Gat ekki fjarlÃ¦gt notandann %s Ãºr hÃ³pnum %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s gekk Ãºr hÃ³pnum %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt nafn: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "StaÃ°setning: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "HeimasÃÃ°a: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Um: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr "SkilaboÃ° eru of lÃ¶ng - 140 tÃ¡kn eru Ã mesta lagi leyfÃ° en Ã¾Ãº sendir %d"
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Bein skilaboÃ° send til %s"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Villa kom upp viÃ° aÃ° senda bein skilaboÃ°"
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "Get ekki kveikt Ã¡ tilkynningum."
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "EyÃ°a Ã¾essu babli"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "Babl sent inn"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "VandamÃ¡l komu upp viÃ° aÃ° vista babl."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "SkilaboÃ° eru of lÃ¶ng - 140 tÃ¡kn eru Ã mesta lagi leyfÃ° en Ã¾Ãº sendir %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Svara Ã¾essu babli"
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "VandamÃ¡l komu upp viÃ° aÃ° vista babl."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Tilgreindu nafn notandans sem Ã¾Ãº vilt gerast Ã¡skrifandi aÃ°"
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "ÃÃº ert ekki Ã¡skrifandi."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "NÃº ert Ã¾Ãº Ã¡skrifandi aÃ° %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Tilgreindu nafn notandans sem Ã¾Ãº vilt hÃ¦tta sem Ã¡skrifandi aÃ°"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "NÃº ert Ã¾Ãº ekki lengur Ã¡skrifandi aÃ° %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Skipun hefur ekki veriÃ° fullbÃºin"
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Tilkynningar af."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "Get ekki slÃ¶kkt Ã¡ tilkynningum."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Tilkynningar Ã¡."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Get ekki kveikt Ã¡ tilkynningum."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "NÃº ert Ã¾Ãº ekki lengur Ã¡skrifandi aÃ° %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "ÃÃº ert ekki Ã¡skrifandi."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ÃÃº ert nÃº Ã¾egar Ã Ã¡skrift aÃ° Ã¾essum notendum:"
 msgstr[1] "ÃÃº ert nÃº Ã¾egar Ã Ã¡skrift aÃ° Ã¾essum notendum:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Gat ekki leyft Ã¶Ã°rum aÃ° gerast Ã¡skrifandi aÃ° Ã¾Ã©r."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Gat ekki leyft Ã¶Ã°rum aÃ° gerast Ã¡skrifandi aÃ° Ã¾Ã©r."
 msgstr[1] "Gat ekki leyft Ã¶Ã°rum aÃ° gerast Ã¡skrifandi aÃ° Ã¾Ã©r."
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "ÃÃº ert ekki meÃ°limur Ã Ã¾essum hÃ³pi."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ÃÃº ert ekki meÃ°limur Ã Ã¾essum hÃ³pi."
 msgstr[1] "ÃÃº ert ekki meÃ°limur Ã Ã¾essum hÃ³pi."
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6414,6 +6645,10 @@ msgstr "Ekkert einkenni gefiÃ° upp."
 msgid "Repeat this notice?"
 msgstr "Svara Ã¾essu babli"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "JÃ¡"
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6608,47 +6843,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "fyrir nokkrum sekÃºndum"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "fyrir um einni mÃnÃºtu sÃÃ°an"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fyrir um %d mÃnÃºtum sÃÃ°an"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "fyrir um einum klukkutÃma sÃÃ°an"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "fyrir um %d klukkutÃmum sÃÃ°an"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "fyrir um einum degi sÃÃ°an"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "fyrir um %d dÃ¶gum sÃÃ°an"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "fyrir um einum mÃ¡nuÃ°i sÃÃ°an"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "fyrir um %d mÃ¡nuÃ°um sÃÃ°an"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "fyrir um einu Ã¡ri sÃÃ°an"
 
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 93795b7bd9..ba89872996 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:26+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:12+0000\n"
 "Language-Team: Italian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: out-statusnet\n"
@@ -74,8 +74,13 @@ msgstr "Chiuso"
 msgid "Save access settings"
 msgstr "Salva impostazioni di accesso"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salva"
@@ -83,7 +88,6 @@ msgstr "Salva"
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:64 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
 msgid "No such page."
 msgstr "Pagina inesistente."
 
@@ -106,7 +110,7 @@ msgstr "Pagina inesistente."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utente inesistente."
@@ -236,13 +240,12 @@ msgid "This method requires a POST."
 msgstr "Questo metodo richiede POST."
 
 #: actions/apiaccountupdatedeliverydevice.php:105
-#, fuzzy
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 "Ã necessario specificare un parametro chiamato \"device\" con un valore tra: "
-"\"sms\", \"im\" o \"none\""
+"\"sms\", \"im\" o \"none\"."
 
 #: actions/apiaccountupdatedeliverydevice.php:132
 msgid "Could not update user."
@@ -349,7 +352,7 @@ msgstr "Nessuno messaggio trovato con quel ID."
 msgid "This status is already a favorite."
 msgstr "Questo messaggio Ã¨ giÃ  un preferito."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Impossibile creare un preferito."
 
@@ -442,9 +445,9 @@ msgid "Too many aliases! Maximum %d."
 msgstr "Troppi alias! Massimo %d."
 
 #: actions/apigroupcreate.php:266
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "Alias non valido: \"%s\""
+msgstr "Alias non valido: \"%s\"."
 
 #: actions/apigroupcreate.php:275 actions/editgroup.php:232
 #: actions/newgroup.php:172
@@ -460,15 +463,14 @@ msgstr "L'alias non puÃ² essere lo stesso del soprannome."
 #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
 #: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
-#, fuzzy
 msgid "Group not found."
-msgstr "Gruppo non trovato!"
+msgstr "Gruppo non trovato."
 
 #: actions/apigroupjoin.php:110 actions/joingroup.php:100
 msgid "You are already a member of that group."
 msgstr "Fai giÃ  parte di quel gruppo."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
 
@@ -519,17 +521,17 @@ msgid "Invalid token."
 msgstr "Token non valido."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -563,12 +565,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "Il token di richiesta %s Ã¨ stato rifiutato o revocato."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Invio del modulo inaspettato."
 
@@ -828,27 +833,44 @@ msgstr ""
 "tuoi messaggi, non potrÃ  piÃ¹ abbonarsi e non riceverai notifica delle @-"
 "risposte che ti invierÃ ."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Non bloccare questo utente"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "SÃ¬"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Blocca questo utente"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Salvataggio delle informazioni per il blocco non riuscito."
 
@@ -861,8 +883,8 @@ msgstr "Salvataggio delle informazioni per il blocco non riuscito."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Nessuna gruppo."
 
@@ -894,9 +916,9 @@ msgstr "Sblocca questo utente"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
-msgstr "Invia a "
+msgstr "Invia a %s"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -912,25 +934,33 @@ msgstr "Quel codice di conferma non Ã¨ per te!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "Tipo di indirizzo %s non riconosciuto"
+msgstr "Tipo di indirizzo %s non riconosciuto."
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
 msgstr "Quell'indirizzo Ã¨ giÃ  stato confermato."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Impossibile aggiornare l'utente."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Impossibile eliminare l'email di conferma."
 
@@ -984,11 +1014,13 @@ msgstr ""
 "Vuoi eliminare questa applicazione? Questa azione eliminerÃ  tutti i dati "
 "riguardo all'applicazione dal database, comprese tutte le connessioni utente."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Non eliminare l'applicazione"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Elimina l'applicazione"
 
@@ -1023,11 +1055,13 @@ msgstr "Elimina messaggio"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Vuoi eliminare questo messaggio?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Non eliminare il messaggio"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Elimina questo messaggio"
 
@@ -1051,7 +1085,8 @@ msgstr ""
 "Vuoi eliminare questo utente? Questa azione eliminerÃ  tutti i dati "
 "dell'utente dal database, senza una copia di sicurezza."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Elimina questo utente"
 
@@ -1071,9 +1106,9 @@ msgid "Invalid logo URL."
 msgstr "URL del logo non valido."
 
 #: actions/designadminpanel.php:280
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "Tema non disponibile: %s"
+msgstr "Tema non disponibile: %s."
 
 #: actions/designadminpanel.php:376
 msgid "Change logo"
@@ -1164,15 +1199,13 @@ msgid "Reset back to default"
 msgstr "Reimposta i valori predefiniti"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Salva"
 
@@ -1298,31 +1331,43 @@ msgstr "Impossibile creare gli alias."
 msgid "Options saved."
 msgstr "Opzioni salvate."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "Impostazioni email"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Gestisci la ricezione delle email da %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Indirizzo"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Indirizzo email"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Indirizzo email attualmente confermato."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Rimuovi"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1331,109 +1376,143 @@ msgstr ""
 "posta (e anche la posta indesiderata!) per un messaggio con ulteriori "
 "istruzioni."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Annulla"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Indirizzo e-mail"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Indirizzo email, del tipo \"nomeutente@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Aggiungi"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Email di ricezione"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Invia le email a questo indirizzo per scrivere nuovi messaggi."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Crea un nuovo indirizzo email a cui inviare i messaggi e rimuovi quello "
 "vecchio."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Nuovo"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Preferenze"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Inviami avvisi di nuovi abbonamenti via email"
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Inviami un'email quando qualcuno aggiunge un mio messaggio ai preferiti"
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Inviami un'email quando qualcuno mi invia un messaggio privato"
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Inviami un'email quando qualcuno mi invia una \"@-risposta\""
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Consenti ai miei amici di richiamarmi e inviami un'email"
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Voglio inviare i messaggi via email"
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Pubblica un MicroID per il mio indirizzo email"
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Preferenze salvate."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Preferenze dell'aspetto salvate."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Nessun indirizzo email."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Impossibile normalizzare quell'indirizzo email"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Non Ã¨ un indirizzo email valido."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Quello Ã¨ giÃ  il tuo indirizzo email."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Quell'indirizzo email appartiene giÃ  a un altro utente."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Impossibile inserire il codice di conferma."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1442,43 +1521,56 @@ msgstr ""
 "Controlla la tua casella di posta (e anche la posta indesiderata!) per il "
 "codice e le istruzioni su come usarlo."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Nessuna conferma da annullare."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Quello Ã¨ l'indirizzo di messaggistica sbagliato."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Conferma annullata."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Quello non Ã¨ il tuo indirizzo email."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "L'indirizzo Ã¨ stato rimosso."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Nessun indirizzo email di ricezione."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Impossibile aggiornare il record dell'utente."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Indirizzo email di ricezione rimosso."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Nuovo indirizzo email di ricezione aggiunto."
 
@@ -1598,9 +1690,8 @@ msgid "Remote service uses unknown version of OMB protocol."
 msgstr "Il servizio remoto usa una versione del protocollo OMB sconosciuta."
 
 #: actions/finishremotesubscribe.php:138
-#, fuzzy
 msgid "Error updating remote profile."
-msgstr "Errore nell'aggiornare il profilo remoto"
+msgstr "Errore nell'aggiornare il profilo remoto."
 
 #: actions/getfile.php:79
 msgid "No such file."
@@ -1670,15 +1761,17 @@ msgstr ""
 "dal gruppo, non potrÃ  piÃ¹ inviare messaggi e non potrÃ  piÃ¹ iscriversi al "
 "gruppo."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Non bloccare l'utente da questo gruppo"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Blocca l'utente da questo gruppo"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "Errore del database nel bloccare l'utente dal gruppo."
 
@@ -1861,11 +1954,15 @@ msgstr "L'utente non Ã¨ bloccato dal gruppo."
 msgid "Error removing the block."
 msgstr "Errore nel rimuovere il blocco."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "Impostazioni messaggistica istantanea"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1875,15 +1972,24 @@ msgstr ""
 "istantanea](%%doc.im%%) Jabber/GTalk. Configura il tuo indirizzo e le "
 "impostazioni qui di seguito."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "Messaggistica istantanea non disponibile."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Indirizzo di messaggistica istantanea"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Indirizzo Jabber/GTalk attualmente confermato."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1893,11 +1999,9 @@ msgstr ""
 "GTalk per un messaggio con ulteriori istruzioni. Hai aggiunto %s al tuo "
 "elenco contatti?"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Indirizzo di messaggistica istantanea"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1907,43 +2011,65 @@ msgstr ""
 "cosa, assicurati di aggiungere %s all'elenco dei contatti nel tuo programma "
 "di messaggistica o su GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferenze"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Inviami i messaggi via Jabber/GTalk"
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Pubblica un messaggio quando il mio stato Jabber/GTalk cambia"
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "Inviami le risposte delle persone a cui sono abbonato via Jabber/GTalk"
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Pubblica un MicroID per il mio indirizzo Jabber/GTalk"
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Preferenze salvate."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Nessun ID di Jabber."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Impossibile normalizzare quell'ID Jabber"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Non Ã¨ un ID Jabber valido"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Quello Ã¨ giÃ  il tuo ID di Jabber."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "ID Jabber giÃ  assegnato a un altro utente."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1952,10 +2078,35 @@ msgstr ""
 "Un codice di conferma Ã¨ stato inviato all'indirizzo di messaggistica "
 "istantanea che hai aggiunto. Devi approvare %s affinchÃ© ti invii messaggi."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Quello Ã¨ l'indirizzo di messaggistica sbagliato."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Impossibile eliminare l'email di conferma."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Conferma annullata."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Quello non Ã¨ il tuo ID di Jabber."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "L'indirizzo Ã¨ stato rimosso."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1977,9 +2128,9 @@ msgid "Invites have been disabled."
 msgstr "Gli inviti sono stati disabilitati."
 
 #: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s"
+msgstr "Devi eseguire l'accesso per invitare altri utenti a usare %s."
 
 #: actions/invite.php:72
 #, php-format
@@ -1998,7 +2149,9 @@ msgstr "Invita nuovi utenti"
 msgid "You are already subscribed to these users:"
 msgstr "Hai giÃ  un abbonamento a questi utenti:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2121,7 +2274,9 @@ msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
 msgid "No nickname or ID."
 msgstr "Nessun soprannome o ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s fa ora parte del gruppo %2$s"
@@ -2130,11 +2285,13 @@ msgstr "%1$s fa ora parte del gruppo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Devi eseguire l'accesso per lasciare un gruppo."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "Non fai parte di quel gruppo."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s ha lasciato il gruppo %2$s"
@@ -2209,9 +2366,8 @@ msgid "Can't make %1$s an admin for group %2$s."
 msgstr "Impossibile rendere %1$s un amministratore del gruppo %2$s"
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
-msgstr "Nessun messaggio corrente"
+msgstr "Nessun messaggio corrente."
 
 #: actions/newapplication.php:52
 msgid "New Application"
@@ -2245,12 +2401,12 @@ msgstr "Usa questo modulo per creare un nuovo gruppo."
 msgid "New message"
 msgstr "Nuovo messaggio"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Non puoi inviare un messaggio a questo utente."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Nessun contenuto!"
 
@@ -2258,7 +2414,7 @@ msgstr "Nessun contenuto!"
 msgid "No recipient specified."
 msgstr "Nessun destinatario specificato."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
@@ -2375,9 +2531,9 @@ msgid "You are not a user of that application."
 msgstr "Non sei un utente di quella applicazione."
 
 #: actions/oauthconnectionssettings.php:186
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to revoke access for app: %s."
-msgstr "Impossibile revocare l'accesso per l'applicazione: "
+msgstr "Impossibile revocare l'accesso per l'applicazione: %s."
 
 #: actions/oauthconnectionssettings.php:198
 msgid "You have not authorized any applications to use your account."
@@ -2390,9 +2546,8 @@ msgstr ""
 "loro applicazioni "
 
 #: actions/oembed.php:79 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "Il messaggio non ha un profilo"
+msgstr "Il messaggio non ha un profilo."
 
 #: actions/oembed.php:86 actions/shownotice.php:175
 #, php-format
@@ -2401,15 +2556,15 @@ msgstr "Stato di %1$s su %2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "tipo di contenuto "
+msgstr "Tipo di contenuto %s non supportato."
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:162
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Solo URL %s attraverso HTTP semplice."
 
 #. TRANS: Client error on an API request with an unsupported data format.
 #: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1069
@@ -2518,7 +2673,7 @@ msgid "6 or more characters"
 msgstr "6 o piÃ¹ caratteri"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Conferma"
 
@@ -2564,24 +2719,24 @@ msgid "Path and server settings for this StatusNet site."
 msgstr "Percorso e impostazioni server per questo sito StatusNet."
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Directory del tema non leggibile: %s"
+msgstr "Directory del tema non leggibile: %s."
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "Directory delle immagini degli utenti non scrivibile: %s"
+msgstr "Directory delle immagini degli utenti non scrivibile: %s."
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "Directory degli sfondi non scrivibile: %s"
+msgstr "Directory degli sfondi non scrivibile: %s."
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "Directory delle localizzazioni non leggibile: %s"
+msgstr "Directory delle localizzazioni non leggibile: %s."
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2721,9 +2876,9 @@ msgid "People search"
 msgstr "Cerca persone"
 
 #: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s."
-msgstr "Non Ã¨ un'etichetta valida di persona: %s"
+msgstr "Non Ã¨ un'etichetta valida di persona: %s."
 
 #: actions/peopletag.php:142
 #, php-format
@@ -2731,9 +2886,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "Utenti auto-etichettati con %1$s - pagina %2$d"
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "Contenuto del messaggio non valido"
+msgstr "Contenuto del messaggio non valido."
 
 #: actions/postnotice.php:101
 #, php-format
@@ -2881,9 +3035,9 @@ msgid "Settings saved."
 msgstr "Impostazioni salvate."
 
 #: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
 msgid "Beyond the page limit (%s)."
-msgstr "Oltre il limite della pagina (%s)"
+msgstr "Oltre il limite della pagina (%s)."
 
 #: actions/public.php:92
 msgid "Could not retrieve public stream."
@@ -3141,7 +3295,6 @@ msgid "Invalid username or password."
 msgstr "Nome utente o password non valido."
 
 #: actions/register.php:343
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues. "
@@ -3178,13 +3331,14 @@ msgid "Longer name, preferably your \"real\" name"
 msgstr "Nome completo, preferibilmente il tuo \"vero\" nome"
 
 #: actions/register.php:494
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
-" a eccezione di questi dati personali: password, indirizzo email, indirizzo "
-"messaggistica istantanea e numero di telefono."
+"I miei testi e file sono disponibili nei termini di %s a eccezione di questi "
+"dati personali: password, indirizzo email, indirizzo messaggistica "
+"istantanea e numero di telefono."
 
 #: actions/register.php:542
 #, php-format
@@ -3801,7 +3955,6 @@ msgid "Minimum text limit is 0 (unlimited)."
 msgstr "Il limite minimo del testo Ã¨ di 0 caratteri (illimitato)."
 
 #: actions/siteadminpanel.php:171
-#, fuzzy
 msgid "Dupe limit must be one or more seconds."
 msgstr "Il limite per i duplicati deve essere di 1 o piÃ¹ secondi."
 
@@ -3894,9 +4047,8 @@ msgid "Unable to save site notice."
 msgstr "Impossibile salvare il messaggio del sito."
 
 #: actions/sitenoticeadminpanel.php:113
-#, fuzzy
 msgid "Max length for the site-wide notice is 255 chars."
-msgstr "La dimensione massima del messaggio del sito Ã¨ di 255 caratteri"
+msgstr "La dimensione massima del messaggio del sito Ã¨ di 255 caratteri."
 
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
@@ -3910,44 +4062,74 @@ msgstr "Testo messaggio del sito (massimo 255 caratteri, HTML consentito)"
 msgid "Save site notice"
 msgstr "Salva messaggio"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "Impostazioni SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Puoi ricevere messaggi SMS attraverso l'email da %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "Il servizio SMS non Ã¨ disponibile."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Indirizzo di messaggistica istantanea"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Numero di telefono attualmente confermato per gli SMS."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "In attesa della conferma per questo numero di telefono."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Codice di conferma"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Inserisci il codice che hai ricevuto sul tuo telefono."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Conferma"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "Numero di telefono per SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Numero di telefono, senza punteggiatura o spazi, con il prefisso"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferenze"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3955,23 +4137,34 @@ msgstr ""
 "Inviami avvisi via SMS: comprendo che potrei incorrere in esorbitanti "
 "bollette da parte del mio operatore"
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Preferenze salvate."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Nessun numero di telefono."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Nessun operatore selezionato."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Quello Ã¨ giÃ  il tuo numero di telefono."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Quel numero di telefono appartiene giÃ  a un altro utente."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -3980,23 +4173,42 @@ msgstr ""
 "aggiunto. Controlla il tuo telefono per il codice e le istruzioni su come "
 "usarlo."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Quello Ã¨ il numero di conferma errato."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Conferma annullata."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Quello non Ã¨ il tuo numero di telefono."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Numero di telefono per SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Operatore telefonico"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Seleziona un operatore"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4005,7 +4217,8 @@ msgstr ""
 "Operatore di telefonia mobile. Se conosci un operatore che accetta gli SMS "
 "via email, ma non Ã¨ elencato qui, scrivici a %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Nessun codice inserito"
 
@@ -4032,7 +4245,6 @@ msgid "Invalid snapshot report URL."
 msgstr "URL di segnalazione snapshot non valido."
 
 #: actions/snapshotadminpanel.php:200
-#, fuzzy
 msgid "Randomly during web hit"
 msgstr "A caso quando avviene un web hit"
 
@@ -4269,7 +4481,6 @@ msgid "User is not silenced."
 msgstr "L'utente non Ã¨ zittito."
 
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
 msgstr "Nessun ID di profilo nella richiesta."
 
@@ -4623,9 +4834,9 @@ msgstr "Impossibile aggiornare il messaggio con il nuovo URI."
 
 #. TRANS: Server exception. %s are the error details.
 #: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "Errore del DB nell'inserire un hashtag: %s"
+msgstr "Errore del database nell'inserire un hashtag: %s"
 
 #: classes/Notice.php:245
 msgid "Problem saving notice. Too long."
@@ -4947,13 +5158,13 @@ msgstr "Licenza del software StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:817
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
 "**%%site.name%%** Ã¨ un servizio di microblog offerto da [%%site.broughtby%%]"
-"(%%site.broughtbyurl%%). "
+"(%%site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:820
@@ -5005,6 +5216,8 @@ msgstr ""
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
+"Tutti i contenuti e i dati di %1$s sono disponibili nei termini della "
+"licenza %2$s."
 
 #. TRANS: DT element for pagination (previous/next, etc.).
 #: lib/action.php:1182
@@ -5207,22 +5420,18 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Accesso predefinito per questa applicazione, sola lettura o lettura-scrittura"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Annulla"
 
 #. TRANS: Application access type
 #: lib/applicationlist.php:136
-#, fuzzy
 msgid "read-write"
 msgstr "Lettura-scrittura"
 
 #. TRANS: Application access type
 #: lib/applicationlist.php:138
-#, fuzzy
 msgid "read-only"
 msgstr "Sola lettura"
 
@@ -5230,11 +5439,10 @@ msgstr "Sola lettura"
 #: lib/applicationlist.php:144
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Approvata %1$s - Accesso \"%2$s\"."
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoca"
@@ -5286,34 +5494,40 @@ msgstr "Comando non riuscito"
 msgid "Notice with that id does not exist"
 msgstr "Un messaggio con quel ID non esiste"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "L'utente non ha un ultimo messaggio."
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Impossibile trovare un utente col soprannome %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Impossibile trovare un utente locale col soprannome %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Questo comando non Ã¨ ancora implementato."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Non ha molto senso se cerchi di richiamarti!"
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Richiamo inviato a %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5324,57 +5538,55 @@ msgstr ""
 "Abbonati: %2$s\n"
 "Messaggi: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Messaggio indicato come preferito."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Fai giÃ  parte di quel gruppo"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
 msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
 
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s fa ora parte del gruppo %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%1$s ha lasciato il gruppo %2$s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Posizione: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina web: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Informazioni: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5383,140 +5595,146 @@ msgstr ""
 "%s Ã¨ un profilo remoto. Ã possibile inviare messaggi privati solo agli "
 "utenti sullo stesso server."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Messaggio diretto a %s inviato."
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Errore nell'inviare il messaggio diretto."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "Impossibile ripetere un proprio messaggio"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "Hai giÃ  ripetuto quel messaggio"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Messaggio da %s ripetuto"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Errore nel ripetere il messaggio."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Risposta a %s inviata"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Errore nel salvare il messaggio."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Specifica il nome dell'utente a cui abbonarti."
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossibile abbonarsi ai profili OMB attraverso un comando."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Abbonati a %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento."
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Abbonamento a %s annullato"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Comando non ancora implementato."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Notifiche disattivate."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "Impossibile disattivare le notifiche."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Notifiche attivate."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Impossibile attivare le notifiche."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "Il comando di accesso Ã¨ disabilitato"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 "Questo collegamento Ã¨ utilizzabile una sola volta ed Ã¨ valido solo per 2 "
 "minuti: %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "%s ha annullato l'abbonamento"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "Il tuo abbonamento Ã¨ stato annullato."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Persona di cui hai giÃ  un abbonamento:"
 msgstr[1] "Persone di cui hai giÃ  un abbonamento:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "Nessuno Ã¨ abbonato ai tuoi messaggi."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Questa persona Ã¨ abbonata ai tuoi messaggi:"
 msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "Non fai parte di alcun gruppo."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Non fai parte di questo gruppo:"
 msgstr[1] "Non fai parte di questi gruppi:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5968,9 +6186,10 @@ msgstr "Conferma SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:457
-#, fuzzy, php-format
+#, php-format
 msgid "%s: confirm you own this phone number with this code:"
-msgstr "In attesa della conferma per questo numero di telefono."
+msgstr ""
+"%s: conferma che questo numero di telefono sia tuo utilizzando questo codice:"
 
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:478
@@ -6099,6 +6318,9 @@ msgid ""
 "\n"
 "\t%s"
 msgstr ""
+"L'intera conversazione puÃ² essere letta qui:\n"
+"\n"
+"%s"
 
 #: lib/mail.php:651
 #, php-format
@@ -6463,6 +6685,10 @@ msgstr "Nessun argomento return-to."
 msgid "Repeat this notice?"
 msgstr "Ripetere questo messaggio?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "SÃ¬"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Ripeti questo messaggio"
@@ -6649,47 +6875,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderatore"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "pochi secondi fa"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "circa un minuto fa"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "circa %d minuti fa"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "circa un'ora fa"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "circa %d ore fa"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "circa un giorno fa"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "circa %d giorni fa"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "circa un mese fa"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "circa %d mesi fa"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "circa un anno fa"
 
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index 91d52c69e4..91c8459211 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:33+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:15+0000\n"
 "Language-Team: Japanese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: out-statusnet\n"
@@ -74,8 +74,13 @@ msgstr "éãããã"
 msgid "Save access settings"
 msgstr "ã¢ã¯ã»ã¹è¨å®ã®ä¿å"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -107,7 +112,7 @@ msgstr "ãã®ãããªãã¼ã¸ã¯ããã¾ããã"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ãã®ãããªã¦ã¼ã¶ã¯ãã¾ããã"
@@ -347,7 +352,7 @@ msgstr "ãã®ï¼©ï¼¤ã®ã¹ãã¼ã¿ã¹ãè¦ã¤ããã¾ããã"
 msgid "This status is already a favorite."
 msgstr "ãã®ã¹ãã¼ã¿ã¹ã¯ãã§ã«ãæ°ã«å¥ãã§ãã"
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "ãæ°ã«å¥ããä½æã§ãã¾ããã"
 
@@ -467,7 +472,7 @@ msgstr "ã°ã«ã¼ããè¦ã¤ããã¾ãã!"
 msgid "You are already a member of that group."
 msgstr "ãã§ã«ãã®ã°ã«ã¼ãã®ã¡ã³ãã¼ã§ãã"
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "ç®¡çèã«ãã£ã¦ãã®ã°ã«ã¼ããããããã¯ããã¦ãã¾ãã"
 
@@ -518,17 +523,17 @@ msgid "Invalid token."
 msgstr "ä¸æ£ãªãã¼ã¯ã³ã"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -561,12 +566,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "ãªã¯ã¨ã¹ããã¼ã¯ã³%sã¯ãæå¦ããã¦ãåãæ¶ããã¾ããã"
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "äºæãã¬ãã©ã¼ã éä¿¡ã§ãã"
 
@@ -823,27 +831,44 @@ msgstr ""
 "ããããã©ãã¼ãå¤ãããã§ããããå°æ¥ãããªãã«ãã©ãã¼ã§ããªãã§ãããªãã¯"
 "ã©ããª @-è¿ä¿¡ ã«ã¤ãã¦ããããããéç¥ãããªãã§ãããã"
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "No"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "ãã®ã¦ã¼ã¶ãã¢ã³ãããã¯ãã"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Yes"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "ãã®ã¦ã¼ã¶ããããã¯ãã"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "ãããã¯æå ±ã®ä¿åã«å¤±æãã¾ããã"
 
@@ -856,8 +881,8 @@ msgstr "ãããã¯æå ±ã®ä¿åã«å¤±æãã¾ããã"
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "ãã®ãããªã°ã«ã¼ãã¯ããã¾ããã"
 
@@ -916,16 +941,24 @@ msgstr "ä¸æãªã¢ãã¬ã¹ã¿ã¤ã %s"
 msgid "That address has already been confirmed."
 msgstr "ãã®ã¢ãã¬ã¹ã¯æ¢ã«æ¿èªããã¦ãã¾ãã"
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ã¦ã¼ã¶ãæ´æ°ã§ãã¾ãã"
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ã¡ã¼ã«æ¿èªãåé¤ã§ãã¾ãã"
 
@@ -980,11 +1013,13 @@ msgstr ""
 "ããªãã¯æ¬å½ã«ãã®ã¦ã¼ã¶ãåé¤ãããã§ãã? ããã¯ããã¯ã¢ãããªãã§ãã¼ã¿"
 "ãã¼ã¹ããã¦ã¼ã¶ã«é¢ãããã¹ã¦ã®ãã¼ã¿ãã¯ãªã¢ãã¾ãã"
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "ãã®ã¢ããªã±ã¼ã·ã§ã³ãåé¤ããªãã§ãã ãã"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "ãã®ã¢ããªã±ã¼ã·ã§ã³ãåé¤"
 
@@ -1019,11 +1054,13 @@ msgstr "ã¤ã¶ããåé¤"
 msgid "Are you sure you want to delete this notice?"
 msgstr "æ¬å½ã«ãã®ã¤ã¶ãããåé¤ãã¾ããï¼"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "ãã®ã¤ã¶ãããåé¤ã§ãã¾ããã"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "ãã®ã¤ã¶ãããåé¤"
 
@@ -1047,7 +1084,8 @@ msgstr ""
 "ããªãã¯æ¬å½ã«ãã®ã¦ã¼ã¶ãåé¤ãããã§ãã? ããã¯ããã¯ã¢ãããªãã§ãã¼ã¿"
 "ãã¼ã¹ããã¦ã¼ã¶ã«é¢ãããã¹ã¦ã®ãã¼ã¿ãã¯ãªã¢ãã¾ãã"
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "ãã®ã¦ã¼ã¶ãåé¤"
 
@@ -1160,15 +1198,13 @@ msgid "Reset back to default"
 msgstr "ããã©ã«ãã¸ãªã»ãããã"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ä¿å"
 
@@ -1294,31 +1330,43 @@ msgstr "å¥åãä½æã§ãã¾ããã"
 msgid "Options saved."
 msgstr "ãªãã·ã§ã³ãä¿åããã¾ããã"
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ã¡ã¼ã«è¨å®"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%% ããã®ã¡ã¼ã«ãç®¡çã"
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "ä½æ"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "ã¡ã¼ã«ã¢ãã¬ã¹"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "ç¾å¨ç¢ºèªããã¦ããã¡ã¼ã«ã¢ãã¬ã¹ã"
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "åé¤"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1326,109 +1374,144 @@ msgstr ""
 "ãã®ã¢ãã¬ã¹ã¯æ¿èªå¾ã¡ã§ããåä¿¡ããã¯ã¹ï¼ã¨ã¹ãã ããã¯ã¹ï¼ã«è¿½å ã®æç¤ºãæ¸"
 "ãããã¡ãã»ã¼ã¸ãå±ãã¦ããªããç¢ºèªãã¦ãã ããã"
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ä¸æ¢"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "ã¡ã¼ã«ã¢ãã¬ã¹"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ã¡ã¼ã«ã¢ãã¬ã¹ã\"UserName@example.org\" ã®ãããª"
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "è¿½å "
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "å¥ã£ã¦ããã¡ã¼ã«"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "æ°ããã¤ã¶ããæç¨¿ã«ãã®ã¢ãã¬ã¹ã¸ã¡ã¼ã«ãã"
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "æç¨¿ã®ããã®æ°ããEã¡ã¼ã«ã¢ãã¬ã¹ãä½ãã¾ã; å¤ãæ¹ãåãæ¶ãã¾ãã"
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "New"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "è¨å®"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "ã¡ã¼ã«ã§æ°è¦ãã©ãã¼ã®éç¥ãç§ã«éã£ã¦ãã ããã"
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "ã ããããæ°ã«å¥ãã¨ãã¦ç§ã®ã¤ã¶ãããå ããããã¡ã¼ã«ãç§ã«éã£ã¦ãã ããã"
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "ã ããããã©ã¤ãã¼ãã»ã¡ãã»ã¼ã¸ãç§ã«éãã¨ãã«ã¯ãã¡ã¼ã«ãç§ã«éã£ã¦ãã ã"
 "ãã"
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ã ããã\"@-è¿ä¿¡\"ãç§ãéãã¨ãã«ã¯ãã¡ã¼ã«ãç§ã«éã£ã¦ãã ããã"
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "åéãç§ã«åå³ã¨ã¡ã¼ã«ãéããã¨ãè¨±å¯ããã"
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "ã¡ã¼ã«ã§ã¤ã¶ãããæç¨¿ãããã"
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "ç§ã®ã¡ã¼ã«ã¢ãã¬ã¹ã®ããã«MicroIDãçºè¡ãã¦ãã ããã"
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "è¨å®ãä¿åããã¾ããã"
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "ãã¶ã¤ã³è¨å®ãä¿åããã¾ããã"
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "ã¡ã¼ã«ã¢ãã¬ã¹ãããã¾ããã"
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "ãã®ã¡ã¼ã«ã¢ãã¬ã¹ãæ£è¦åã§ãã¾ãã"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "æå¹ãªã¡ã¼ã«ã¢ãã¬ã¹ã§ã¯ããã¾ããã"
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "ããã¯ãã§ã«ããªãã®ã¡ã¼ã«ã¢ãã¬ã¹ã§ãã"
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "ãã®ã¡ã¼ã«ã¢ãã¬ã¹ã¯æ¢ã«ä»ã®äººãä½¿ã£ã¦ãã¾ãã"
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "æ¿èªã³ã¼ããè¿½å ã§ãã¾ãã"
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1437,43 +1520,56 @@ msgstr ""
 "ã ããã¯ã¹ï¼ã«ã³ã¼ãã¨ãããã©ãä½¿ãã®ãã¨ããæç¤ºãå±ãã¦ããªããç¢ºèªãã¦ã"
 "ã ããã"
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "æ¿èªå¾ã¡ã®ãã®ã¯ããã¾ããã"
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "ãã® IM ã¢ãã¬ã¹ã¯ä¸æ£ã§ãã"
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "æ¿èªä½æ¥ãä¸æ¢ããã¾ããã"
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "ããã¯ããªãã®ã¡ã¼ã«ã¢ãã¬ã¹ã§ã¯ããã¾ããã"
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "ã¢ãã¬ã¹ã¯åé¤ããã¾ããã"
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "å¥ã£ã¦ããã¡ã¼ã«ã¢ãã¬ã¹ã§ã¯ããã¾ããã"
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ã¦ã¼ã¶ã¬ã³ã¼ããæ´æ°ã§ãã¾ããã"
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "å¥ã£ã¦ããã¡ã¼ã«ã¢ãã¬ã¹ã¯åé¤ããã¾ããã"
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "æ°ããå¥ã£ã¦ããã¡ã¼ã«ã¢ãã¬ã¹ãè¿½å ããã¾ããã"
 
@@ -1668,15 +1764,17 @@ msgstr ""
 "æ¬å½ã«ã¦ã¼ã¶ %1$s ãã°ã«ã¼ã %2$s ãããããã¯ãã¾ãã? å½¼ãã¯ã°ã«ã¼ãããå"
 "é¤ããããæç¨¿ã§ããªããã°ã«ã¼ãããã©ãã¼ã§ããªããªãã¾ãã"
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "ãã®ã°ã«ã¼ããããã®ã¦ã¼ã¶ããããã¯ããªã"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "ãã®ã°ã«ã¼ããããã®ã¦ã¼ã¶ããããã¯"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "ã°ã«ã¼ãããã®ãããã¯ã¦ã¼ã¶ã®ãã¼ã¿ãã¼ã¹ã¨ã©ã¼"
 
@@ -1859,11 +1957,15 @@ msgstr "ã¦ã¼ã¶ã¯ã°ã«ã¼ããããããã¯ããã¦ãã¾ããã"
 msgid "Error removing the block."
 msgstr "ãããã¯ã®åé¤ã¨ã©ã¼"
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "IMè¨å®"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1872,15 +1974,24 @@ msgstr ""
 "Jabber/GTalk [instant messages](%%doc.im%%)ãçµç±ã§éç¥ã®éä¿¡ãåä¿¡ãå¯è½ã§"
 "ããä¸ã®ã¢ãã¬ã¹ãè¨å®ãã¦ä¸ããã"
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "ï¼©ï¼ ãå©ç¨ä¸å¯ã"
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IMã¢ãã¬ã¹"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ç¢ºèªãããææ°ã®ãJabber/GTakk ã¢ãã¬ã¹"
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1889,11 +2000,9 @@ msgstr ""
 "ãã®ã¢ãã¬ã¹ã¯æ¿èªå¾ã¡ã§ããJabber ã Gtalk ã®ã¢ã«ã¦ã³ãã§è¿½å ã®æç¤ºãæ¸ãã"
 "ãã¡ãã»ã¼ã¸ãç¢ºèªãã¦ãã ããã(%s ãåäººãªã¹ãã«è¿½å ãã¾ãããï¼)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IMã¢ãã¬ã¹"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1902,45 +2011,67 @@ msgstr ""
 "\"UserName@example.org\" ã¨ãã£ã Jabber ã¾ãã¯ GTalk ã®ã¢ãã¬ã¹ãã¾ãã%s ã"
 "IMã¯ã©ã¤ã¢ã³ããGTalkã«è¿½å ãã¦ä¸ããã"
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "è¨å®"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk ã§ç§ã«éç¥ãéã£ã¦ä¸ããã"
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalkã®ã¹ãã¼ã¿ã¹ãå¤æ´ãããæã«éç¥ãéãã"
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Jabber/GTalkãéãã¦åçããç§ããã©ãã¼ããã¦ããªãäººãããç§ã«éã£ã¦ãã ã"
 "ãã"
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ç§ã®Jabber/GTalkã¢ãã¬ã¹ã®ããã«MicroIDãçºè¡ãã¦ãã ããã"
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "è¨å®ãä¿åããã¾ããã"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Jabbar ID ã¯ããã¾ããã"
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "ãã® Jabbar ID ãæ£è¦åã§ãã¾ãã"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "æå¹ãª Jabber ID ã§ã¯ããã¾ããã"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "ãã® Jabber ID ã¯æ¢ã«ããªãã®ãã®ã§ãã"
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID ï½ã¯æ¢ã«å¥ã®ã¦ã¼ã¶ãä½¿ç¨ãã¦ãã¾ãã"
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1949,10 +2080,35 @@ msgstr ""
 "æ¿èªã³ã¼ããå¥åããã IM ã¢ãã¬ã¹ã«éä¿¡ãã¾ãããããªãã«ã¡ãã»ã¼ã¸ãéãã"
 "ããã«ããã«ã¯%sãæ¿èªãã¦ãã ããã"
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "ãã® IM ã¢ãã¬ã¹ã¯ä¸æ£ã§ãã"
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ã¡ã¼ã«æ¿èªãåé¤ã§ãã¾ãã"
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "æ¿èªä½æ¥ãä¸æ¢ããã¾ããã"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "ãã® Jabber ID ã¯ããªãã®ãã®ã§ã¯ããã¾ããã"
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "ã¢ãã¬ã¹ã¯åé¤ããã¾ããã"
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1994,7 +2150,9 @@ msgstr "æ°ããã¦ã¼ã¶ãæå¾"
 msgid "You are already subscribed to these users:"
 msgstr "ãã§ã«ãããã®ã¦ã¼ã¶ããã©ãã¼ãã¦ãã¾ã:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2120,7 +2278,9 @@ msgstr "ã°ã«ã¼ãã«å¥ãããã«ã¯ãã°ã¤ã³ããªããã°ãªãã¾ã
 msgid "No nickname or ID."
 msgstr "ããã¯ãã¼ã ãããã¾ããã"
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ã¯ã°ã«ã¼ã %2$s ã«åå ãã¾ãã"
@@ -2129,11 +2289,13 @@ msgstr "%1$s ã¯ã°ã«ã¼ã %2$s ã«åå ãã¾ãã"
 msgid "You must be logged in to leave a group."
 msgstr "ã°ã«ã¼ãããé¢ããã«ã¯ãã°ã¤ã³ãã¦ããªããã°ãªãã¾ããã"
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "ããªãã¯ãã®ã°ã«ã¼ãã®ã¡ã³ãã¼ã§ã¯ããã¾ããã"
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s ã¯ã°ã«ã¼ã %2$s ã«æ®ãã¾ããã"
@@ -2243,12 +2405,12 @@ msgstr "ãã®ãã©ã¼ã ãä½¿ã£ã¦æ°ããã°ã«ã¼ããä½æãã¾ãã
 msgid "New message"
 msgstr "æ°ããã¡ãã»ã¼ã¸"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "ãã®ã¦ã¼ã¶ã«ã¡ãã»ã¼ã¸ãéããã¨ã¯ã§ãã¾ããã"
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "ã³ã³ãã³ããããã¾ããï¼"
 
@@ -2256,7 +2418,7 @@ msgstr "ã³ã³ãã³ããããã¾ããï¼"
 msgid "No recipient specified."
 msgstr "ååäººãæ¸ããã¦ãã¾ããã"
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2516,7 +2678,7 @@ msgid "6 or more characters"
 msgstr "6æåä»¥ä¸"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "ãã¹ã¯ã¼ãç¢ºèª"
 
@@ -3916,45 +4078,75 @@ msgstr ""
 msgid "Save site notice"
 msgstr "ãµã¤ãã¤ã¶ãã"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "SMS è¨å®"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "ããªãã¯ %%site.name%% ããã¡ã¼ã«ã§SMSã¡ãã»ã¼ã¸ãåãåããã¨ãã§ãã¾ãã"
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "SMS ã¯å©ç¨ã§ãã¾ããã"
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IMã¢ãã¬ã¹"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "ç¾å¨ã®ç¢ºèªããã SMS å¯è½ãªé»è©±çªå·ã"
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "ãã®é»è©±çªå·ã¯ç¢ºèªå¾ã¡ã§ãã"
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "ç¢ºèªã³ã¼ã"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "ããªããããªãã®é»è©±ã§åãåã£ãã³ã¼ããå¥ãã¦ãã ããã"
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "ãã¹ã¯ã¼ãç¢ºèª"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "SMS é»è©±çªå·"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "é»è©±çªå·ãå¥èªç¹ã¾ãã¯ã¹ãã¼ã¹ããªããå¸è¡çªå·ä»ã"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "è¨å®"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3962,23 +4154,34 @@ msgstr ""
 "SMSãéãã¦ã¤ã¶ãããç§ã«éã£ã¦ãã ãã; ç§ã¯ãç§ã®ãã£ãªã¢ããæ³å¤ãªæéãè¢«"
 "ããããããªãã®ãçè§£ãã¦ãã¾ãã"
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "è¨å®ãä¿åããã¾ããã"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "é»è©±çªå·ãããã¾ããã"
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "ãã£ãªã¢ãé¸æããã¦ãã¾ããã"
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "ããã¯ãã§ã«ããªãã®é»è©±çªå·ã§ãã"
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "ãã®é»è©±çªå·ã¯ãã§ã«ä»ã®ã¦ã¼ã¶ã«ä½¿ããã¦ãã¾ãã"
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -3986,23 +4189,42 @@ msgstr ""
 "ããªããå ããé»è©±çªå·ã«ç¢ºèªã³ã¼ããéãã¾ããã ã©ããããä½¿ç¨ãããã«é¢ãã"
 "ã³ã¼ãã¨æç¤ºã®ããã«é»è©±ããã§ãã¯ãã¦ãã ããã"
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "ããã¯ééã£ãç¢ºèªçªå·ã§ãã"
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "æ¿èªä½æ¥ãä¸æ¢ããã¾ããã"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "ããã¯ããªãã®é»è©±çªå·ã§ã¯ããã¾ããã"
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS é»è©±çªå·"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "æºå¸¯é»è©±ä¼ç¤¾"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "ãã£ãªã¢é¸æ"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4012,7 +4234,8 @@ msgstr ""
 "è¼ããã¦ããªããã£ãªã¢ãç¥ã£ã¦ãããªããã¡ã¼ã«ãéã£ã¦ã%sã§ç§ãã¡ã«ç¥ããã¦"
 "ãã ããã"
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "ã³ã¼ããå¥åããã¦ãã¾ãã"
 
@@ -5228,10 +5451,8 @@ msgstr ""
 "ãã®ã¢ããªã±ã¼ã·ã§ã³ã®ããã®ããã©ã«ãã¢ã¯ã»ã¹: ãªã¼ããªã³ãªã¼ãã¾ãã¯ãªã¼ã"
 "ã©ã¤ã"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "ä¸æ¢"
 
@@ -5307,34 +5528,40 @@ msgstr "ã³ãã³ãå¤±æ"
 msgid "Notice with that id does not exist"
 msgstr "ãã® ID ã«ããã¤ã¶ããã¯åå¨ãã¦ãã¾ãã"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "ã¦ã¼ã¶ã¯ã¾ã ã¤ã¶ããã¦ãã¾ãã"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ã¦ã¼ã¶ãæ´æ°ã§ãã¾ãã"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "ã¦ã¼ã¶ãæ´æ°ã§ãã¾ãã"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "ãã¿ã¾ããããã®ã³ãã³ãã¯ã¾ã å®è£ããã¦ãã¾ããã"
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "ããã¯èªåèªèº«ã¸ã®åå³ã§å¤ãã¯æå³ãããã¾ãã!"
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "%s ã¸åå³ãéãã¾ãã"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5345,193 +5572,197 @@ msgstr ""
 "ãã©ãã¼ããã¦ãã: %2$s\n"
 "ã¤ã¶ãã: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "ãæ°ã«å¥ãã«ããã¦ããã¤ã¶ããã"
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "ããªãã¯æ¢ã«ãã®ã°ã«ã¼ãã«åå ãã¦ãã¾ãã"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "ã¦ã¼ã¶ %s ã¯ã°ã«ã¼ã %s ã«åå ã§ãã¾ãã"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s ã¯ã°ã«ã¼ã %s ã«åå ãã¾ãã"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "ã¦ã¼ã¶ %1$s ã¯ã°ã«ã¼ã %2$s ã«åå ã§ãã¾ããã"
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "ã¦ã¼ã¶ %s ãã°ã«ã¼ã %s ããåé¤ãããã¨ãã§ãã¾ãã"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s ã¯ã°ã«ã¼ã %s ã«æ®ãã¾ããã"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "ãã«ãã¼ã ï¼ %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "å ´æ: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "ãã¼ã ãã¼ã¸: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "ã¡ãã»ã¼ã¸ãé·ããã¾ã - æå¤§ %d åãããªããéã£ãã®ã¯ %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "ã¡ãã»ã¼ã¸ãé·ããã¾ã - æå¤§ %1$d åãããªããéã£ãã®ã¯ %2$dã"
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "ãã¤ã¬ã¯ãã¡ãã»ã¼ã¸ã %s  ã«éãã¾ãã"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "ãã¤ã¬ã¯ãã¡ãã»ã¼ã¸éä¿¡ã¨ã©ã¼ã"
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "èªåã®ã¤ã¶ãããç¹°ãè¿ããã¨ã¯ã§ãã¾ãã"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "ãã§ã«ãã®ã¤ã¶ããã¯ç¹°ãè¿ããã¦ãã¾ã"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "%s ããã¤ã¶ãããç¹°ãè¿ããã¦ãã¾ã"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "ã¤ã¶ããç¹°ãè¿ãã¨ã©ã¼"
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "ã¤ã¶ãããé·ããã¾ã - æå¤§ %d åãããªããéã£ãã®ã¯ %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "%s ã¸è¿ä¿¡ãéãã¾ãã"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "ã¤ã¶ããä¿åã¨ã©ã¼ã"
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "ãã©ãã¼ããã¦ã¼ã¶ã®ååãæå®ãã¦ãã ãã"
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "ããªãã¯ãã®ãããã¡ã¤ã«ã«ãã©ãã¼ããã¦ãã¾ããã"
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "%s ããã©ãã¼ãã¾ãã"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "ãã©ãã¼ããããã¦ã¼ã¶ã®ååãæå®ãã¦ãã ãã"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "%s ã®ãã©ãã¼ãããã"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "ã³ãã³ãã¯ã¾ã å®è£ããã¦ãã¾ããã"
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "éç¥ãªãã"
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "éç¥ããªãã§ãã¾ããã"
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "éç¥ãªã³ã"
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "éç¥ããªã³ã§ãã¾ããã"
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "ãã°ã¤ã³ã³ãã³ããç¡å¹ã«ãªã£ã¦ãã¾ãã"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr "ãã®ãªã³ã¯ã¯ããã¤ã¦ã ãä½¿ç¨å¯è½ã§ããã2åéã ãè¯ãã§ã: %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "%s ã®ãã©ãã¼ãããã"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "ããªãã¯ã ãã«ããã©ãã¼ããã¦ãã¾ããã"
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ããªãã¯ãã®äººã«ãã©ãã¼ããã¦ãã¾ã:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "èª°ããã©ãã¼ãã¦ãã¾ããã"
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "ãã®äººã¯ããªãã«ãã©ãã¼ããã¦ãã:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "ããªãã¯ã©ã®ã°ã«ã¼ãã®ã¡ã³ãã¼ã§ãããã¾ããã"
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ããªãã¯ãã®ã°ã«ã¼ãã®ã¡ã³ãã¼ã§ã¯ããã¾ãã:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6444,6 +6675,10 @@ msgstr "return-to å¼æ°ãããã¾ããã"
 msgid "Repeat this notice?"
 msgstr "ãã®ã¤ã¶ãããç¹°ãè¿ãã¾ãã?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Yes"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "ãã®ã¤ã¶ãããç¹°ãè¿ã"
@@ -6634,47 +6869,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "ç®¡ç"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "æ°ç§å"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "ç´ 1 åå"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "ç´ %d åå"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "ç´ 1 æéå"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "ç´ %d æéå"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "ç´ 1 æ¥å"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "ç´ %d æ¥å"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "ç´ 1 ãµæå"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "ç´ %d ãµæå"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "ç´ 1 å¹´å"
 
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index fe03c831a9..7df910a59f 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:38+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:18+0000\n"
 "Language-Team: Korean\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: out-statusnet\n"
@@ -71,8 +71,13 @@ msgstr "íì"
 msgid "Save access settings"
 msgstr "ì ê·¼ ì¤ì ì ì ì¥"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ì ì¥"
@@ -103,7 +108,7 @@ msgstr "í´ë¹íë íì´ì§ ìì"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "í´ë¹íë ì´ì©ì ìì"
@@ -336,7 +341,7 @@ msgstr "ê·¸ IDë¡ ë°ê²¬ë ìíê° ììµëë¤."
 msgid "This status is already a favorite."
 msgstr "ì´ ììì ì´ë¯¸ ê´ì¬ììì¼ë¡ ë±ë¡ëì´ ììµëë¤."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "ê´ì¬ììì ìì±í  ì ììµëë¤."
 
@@ -455,7 +460,7 @@ msgstr "ê·¸ë£¹ì ì°¾ì ì ììµëë¤."
 msgid "You are already a member of that group."
 msgstr "ë¹ì ì ì´ë¯¸ ì´ ê·¸ë£¹ì ë©¤ë²ìëë¤."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -507,17 +512,17 @@ msgid "Invalid token."
 msgstr "ì³ì§ ìì í¬ê¸°"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -549,12 +554,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "ìëª»ë í¼ ì ì¶"
 
@@ -813,27 +821,44 @@ msgstr ""
 "ì ë§ ì´ì©ìë¥¼ ì°¨ë¨íìê² ìµëê¹? ì°¨ë¨ë ì´ì©ìë êµ¬ëí´ì ëê³ , ì´í ë¹ì ì êµ¬"
 "ëí  ì ìì¼ë©°, ì°¨ë¨ë ì´ì©ìë¡ë¶í° @-ëµì¥ì íµë³´ë¥¼ ë°ì§ ìê² ë©ëë¤."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "ìëì¤"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "ì´ì©ìë¥¼ ì°¨ë¨íì§ ìëë¤."
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "ë¤, ë§ìµëë¤."
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "ì´ ì¬ì©ì ì°¨ë¨íê¸°"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "ì ë³´ì°¨ë¨ì ì ì¥íëë° ì¤í¨íìµëë¤."
 
@@ -846,8 +871,8 @@ msgstr "ì ë³´ì°¨ë¨ì ì ì¥íëë° ì¤í¨íìµëë¤."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "ê·¸ë¬í ê·¸ë£¹ì´ ììµëë¤."
 
@@ -907,16 +932,24 @@ msgstr "ì¸ìëì§ìì ì£¼ìì í %s"
 msgid "That address has already been confirmed."
 msgstr "ê·¸ ì£¼ìë ì´ë¯¸ ì¹ì¸ëììµëë¤."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ì¬ì©ìë¥¼ ìë°ì´í¸ í  ì ììµëë¤."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ì´ë©ì¼ ì¹ì¸ì ìì  í  ì ììµëë¤."
 
@@ -973,12 +1006,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "ì´ íµì§ë¥¼ ì§ì¸ ì ììµëë¤."
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "ì´ ê²ìê¸ ìì íê¸°"
@@ -1014,12 +1049,14 @@ msgstr "íµì§ ìì "
 msgid "Are you sure you want to delete this notice?"
 msgstr "ì ë§ë¡ íµì§ë¥¼ ìì íìê² ìµëê¹?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "ì´ íµì§ë¥¼ ì§ì¸ ì ììµëë¤."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "ì´ ê²ìê¸ ìì íê¸°"
 
@@ -1043,7 +1080,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 #, fuzzy
 msgid "Delete this user"
 msgstr "ì´ ê²ìê¸ ìì íê¸°"
@@ -1159,15 +1197,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ì ì¥"
 
@@ -1302,31 +1338,43 @@ msgstr "ì¢ìíë ê²ìê¸ì ìì±í  ì ììµëë¤."
 msgid "Options saved."
 msgstr "ìµìë¤ì´ ì ì¥ëììµëë¤."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ì´ë©ì¼ ì¤ì "
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%%ìì ì´ë»ê² ì´ë©ì¼ì ë°ìì§ ì íììì¤."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "ì£¼ì"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "ì´ë©ì¼ ì£¼ì"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "íì¸ë ìµì ì ì´ë©ì¼ ê³ì "
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "ìì "
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1334,107 +1382,142 @@ msgstr ""
 "ì´ ì£¼ìë ì¸ì¦ ëê¸°ì¤ìëë¤. ìì í¨(ëë ì¤í¸í¨)ì íì¸íìì ì§ì¹¨ì íì¸í´ "
 "ì£¼ìê¸° ë°ëëë¤."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ì·¨ì"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "ì´ë©ì¼ ì£¼ì"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "\"UserName@example.org\" ì ê°ì ì´ë©ì¼ ê³ì "
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "ì¶ê°"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ë°ì ì´ë©ì¼"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "ìë¡ì´ íµì§ë¥¼ ì¬ë¦¬ë ¤ë©´ ì´ ì£¼ìë¡ ë©ì¼ì ë³´ë´ììì¤/"
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "í¬ì¤íì ìí ì ì´ë©ì¼ ê³ì ì ìì±; ì  ì´ë©ì¼ ê³ì ì ì·¨ì."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "ìë¡ì´"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "ì¤ì "
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "ìë¡ì´ ìì½ êµ¬ëì íµì§ë¥¼ ì´ë©ì¼ë¡ ë³´ë´ì£¼ì¸ì."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "ëêµ°ê° ë´ ê¸ì ì¢ìíë ê²ìê¸ë¡ ì¶ê°íìë, ì´ë©ì¼ì ë³´ëëë¤."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "ëêµ°ê° ë´ê² ë¹ë°ë©ìì§ë¥¼ ë³´ëìë, ì´ë©ì¼ì ë³´ëëë¤."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ëêµ°ê° ë´ê² ë¹ë°ë©ìì§ë¥¼ ë³´ëìë, ì´ë©ì¼ì ë³´ëëë¤."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "ì¹êµ¬ë¤ì´ ë´ê² ì´ë©ì¼ì´ë ìª½ì§ë¥¼ ë³´ë¼ ì ìëë¡ íì©í©ëë¤."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "ì´ë©ì¼ë¡ íµë³´ë¥¼ í¬ì¤í¸ íê¸¸ ìí©ëë¤."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "ì´ë©ì¼ ì£¼ìë¥¼ ìí MicroIDì ìì±"
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "ì¤ì ì´ ì ì¥ëììµëë¤."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "ì±í¬ì¤ì ì´ ì ì¥ëììµëë¤."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "ì´ë©ì¼ì´ ì¶ê° ëì§ ìììµëë¤."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "ê·¸ ì´ë©ì¼ ì£¼ìë¥¼ ì ê·í í  ì ììµëë¤."
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ì í¨í ì´ë©ì¼ ì£¼ìê° ìëëë¤."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "ê·¸ ì´ë©ì¼ ì£¼ìë ì´ë¯¸ ê·íì ê²ìëë¤."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "ê·¸ ì´ë©ì¼ ì£¼ìë ì´ë¯¸ ë¤ë¥¸ ì¬ì©ìì ìì ìëë¤."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "íì¸ ì½ëë¥¼ ì¶ê° í  ì ììµëë¤."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1442,43 +1525,56 @@ msgstr ""
 "ì¶ê°í ì´ë©ì¼ë¡ ì¸ì¦ ì½ëë¥¼ ë³´ëìµëë¤. ìì í¨(ëë ì¤í¸í¨)ì íì¸íìì ì½ë"
 "ì ì¬ì©ë²ì íì¸íì¬ ì£¼ìê¸° ë°ëëë¤."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ì·¨ì í  ëê¸°ì¤ì¸ ì¸ì¦ì´ ììµëë¤."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "ì³ì§ ìì ë©ì ì  ê³ì  ìëë¤."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "ì¸ì¦ ì·¨ì"
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "ê·¸ ì´ë©ì¼ ì£¼ìë ê·íì ê²ì´ ìëëë¤."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "ì£¼ìê° ìì ëììµëë¤."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ì´ë©ì¼ ì£¼ìê° ììµëë¤."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ì¬ì©ì ê¸°ë¡ì ìë°ì´í¸ í  ì ììµëë¤."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ë°ì ì´ë©ì¼ ê³ì  ìì "
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ìë¡ì´ ì´ë©ì¼ ì£¼ìê° ì¶ê° ëììµëë¤."
 
@@ -1676,17 +1772,19 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 #, fuzzy
 msgid "Do not block this user from this group"
 msgstr "ì´ ê·¸ë£¹ì íìë¦¬ì¤í¸"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 #, fuzzy
 msgid "Block this user from this group"
 msgstr "ì´ ê·¸ë£¹ì íìë¦¬ì¤í¸"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1864,12 +1962,16 @@ msgstr "íìì´ ë¹ì ì ì°¨ë¨í´ììµëë¤."
 msgid "Error removing the block."
 msgstr "ì°¨ë¨ ì ê±° ìë¬!"
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "ë©ì ì  ì¤ì "
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1878,15 +1980,25 @@ msgstr ""
 "ë¹ì ì Jabberë êµ¬ê¸í í¬(%%doc.im%%)ë¥¼ íµí´ ë©ìì§ë¥¼ ì£¼ê³ ë°ì ì ììµëë¤. ì"
 "ë ë¹ì ì ì£¼ìì íê²½ì¤ì ì ì¡°ì íì¸ì."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "ì¸ì¤í´í¸ ë©ì ì ë¥¼ ì¬ì©í  ì ììµëë¤."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "ë©ì ì  ì£¼ì"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "íì¸ë ìµì ì Jabber/GTalk ê³ì "
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1895,12 +2007,9 @@ msgstr ""
 "ì´ ì£¼ìë ì¸ì¦ ëê¸° ì¤ìëë¤. Jabber/Gtalkë¡ ë©ìì§ë¥¼ íì¸í´ ì£¼ììì¤.(%s í"
 "ëª©ì ì¶ê°íì¨ìµëê¹?)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "ë©ì ì  ì£¼ì"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1909,44 +2018,66 @@ msgstr ""
 "\"UserName@example.org\" ì ê°ì Jabber ëë GTalk ê³ì ì ê·íì ë©ì ì ë "
 "GTalk ì¹êµ¬ëª©ë¡ì ë°ëì %s ì£¼ìë¥¼ ì¶ê°íì¬ ì£¼ììì¤."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "ì¤ì "
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Jabber/GTalk ë¡ íµì§ë¥¼ ë³´ë´ì£¼ì¸ì."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Jabber/GTalkì ìíê° ë³ê²½ëìì ë íµì§ë¥¼ ë³´ëëë¤."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "ë´ê° êµ¬ëíì§ ìë ì¬ëì¼ë¡ ë¶í°ì ëµì¥ì  Jabber/GTalkì íµí´ ë³´ë´ì£¼ì¸ì."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Jabber/GTalk ê³ì ì ìí MicroIDì ìì±"
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "ì¤ì ì´ ì ì¥ëììµëë¤."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Jabber IDê° ìëëë¤."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "ê·¸ Jabbar IDë¥¼ ì ê·í í  ì ììµëë¤."
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "ì í¨í Jabber IDê° ìëëë¤."
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "ê·¸ Jabber IDë ì´ë¯¸ ê·íì ê²ìëë¤."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber IDê° ì´ë¯¸ ë¤ë¥¸ ì¬ì©ìì ìíì¬ ì¬ì©ëê³  ììµëë¤."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1955,10 +2086,35 @@ msgstr ""
 "ì¶ê°í ë©ì ì  ì£¼ìë¡ ì¸ì¦ ì½ëë¥¼ ë³´ëìµëë¤. %s ì¬ì©ìë¥¼ íë½í´ì¼ ë©ìì§ë¥¼ ì "
 "ë¬í  ì ììµëë¤."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "ì³ì§ ìì ë©ì ì  ê³ì  ìëë¤."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ì´ë©ì¼ ì¹ì¸ì ìì  í  ì ììµëë¤."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "ì¸ì¦ ì·¨ì"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "ê·¸ Jabber IDë ê·íì ê²ì´ ìëëë¤."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "ì£¼ìê° ìì ëììµëë¤."
+
 #: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1999,7 +2155,9 @@ msgstr "ì ì¬ì©ìë¥¼ ì´ë"
 msgid "You are already subscribed to these users:"
 msgstr "ë¹ì ì ë¤ì ì¬ì©ìë¥¼ ì´ë¯¸ êµ¬ëíê³  ììµëë¤."
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2117,7 +2275,9 @@ msgstr "ê·¸ë£¹ê°ìì ìí´ìë ë¡ê·¸ì¸ì´ íìí©ëë¤."
 msgid "No nickname or ID."
 msgstr "ë³ëªì´ ììµëë¤."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, fuzzy, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%s ë ê·¸ë£¹ %sì ê°ìíìµëë¤."
@@ -2126,11 +2286,13 @@ msgstr "%s ë ê·¸ë£¹ %sì ê°ìíìµëë¤."
 msgid "You must be logged in to leave a group."
 msgstr "ê·¸ë£¹ì ë ëê¸° ìí´ìë ë¡ê·¸ì¸í´ì¼ í©ëë¤."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "ë¹ì ì í´ë¹ ê·¸ë£¹ì ë©¤ë²ê° ìëëë¤."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%sê° ê·¸ë£¹%së¥¼ ë ë¬ìµëë¤."
@@ -2244,12 +2406,12 @@ msgstr "ì ê·¸ë£¹ì ë§ë¤ê¸° ìí´ ì´ ììì ì¬ì©íì¸ì."
 msgid "New message"
 msgstr "ìë¡ì´ ë©ìì§ìëë¤."
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "ë¹ì ì ì´ ì¬ì©ììê² ë©ìì§ë¥¼ ë³´ë¼ ì ììµëë¤."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "ë´ì©ì´ ììµëë¤!"
 
@@ -2257,7 +2419,7 @@ msgstr "ë´ì©ì´ ììµëë¤!"
 msgid "No recipient specified."
 msgstr "ìì ìë¥¼ ì§ì íì§ ìììµëë¤."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2520,7 +2682,7 @@ msgid "6 or more characters"
 msgstr "6ê¸ì ì´ì"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "ì¸ì¦"
 
@@ -3900,48 +4062,78 @@ msgstr ""
 msgid "Save site notice"
 msgstr "ì¬ì´í¸ ê³µì§"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "SMS ì¸í"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "ë¹ì ì %%site.name%% ë¡ë¶í° ì´ë©ì¼ì íµí´ SMSë©ìì§ë¥¼ ë°ì ì ììµëë¤."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "ì´ íì´ì§ë ê·íê° ì¹ì¸í ë¯¸ëì´ íìììë ì´ì©í  ì ììµëë¤."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "ë©ì ì  ì£¼ì"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "íì¸ë ìµì ì SMSê° ê°ë¥í í´ëí° ë²í¸"
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "ì´ ì í ë²í¸ë ì¸ì¦ ëê¸°ì¤ìëë¤."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "ì¸ì¦ ì½ë"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "í´ëí°ì¼ë¡ ë°ì¼ì  ì¸ì¦ë²í¸ë¥¼ ìë ¥íììì¤."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "ì¸ì¦"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 #, fuzzy
 msgid "SMS phone number"
 msgstr "SMS í´ëí° ë²í¸"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "ì§ìë²í¸ì í¨ê» ëì´ì°ê¸° ìì´ ë²í¸ë¥¼ ì ì´ ì£¼ì¸ì."
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "ì¤ì "
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3949,23 +4141,34 @@ msgstr ""
 "íµì§ë¥¼ SMSë¡ ë³´ë´ì£¼ì¸ì; ë¬¼ë¡  íµì ì¬ë¡ë¶í° ë°ê°ì§ ìê¸ì ë¬¸ë¤ë ê²ì ìê³  ì"
 "ìµëë¤."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "ì¤ì ì´ ì ì¥ëììµëë¤."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "í´ëí° ë²í¸ê° ììµëë¤."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "íµì íì¬ê° ì í ëì§ ìììµëë¤."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "ê·¸ í´ëí° ë²í¸ë ì´ë¯¸ ê·íì ê²ìëë¤."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "ê·¸ í´ëí° ë²í¸ë ì´ë¯¸ ë¤ë¥¸ ì¬ì©ìì ê²ìëë¤."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -3974,30 +4177,50 @@ msgstr ""
 "ì¶ê°í í´ëí°ì¼ë¡ ì¸ì¦ ì½ëë¥¼ ë³´ëìµëë¤. ìì í¨(ëë ì¤í¸í¨)ì íì¸íìì ì½"
 "ëì ì¬ì©ë²ì íì¸íì¬ ì£¼ìê¸° ë°ëëë¤."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "ì³ì§ ìì ì¸ì¦ ë²í¸ ìëë¤."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "ì¸ì¦ ì·¨ì"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "ê·¸ í´ëí° ë²í¸ë ê·íì ê²ì´ ìëëë¤."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS í´ëí° ë²í¸"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "í´ëì í ì¬ìì"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "íµì  íì¬ë¥¼ ì í íì¸ì."
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr "ê·íì í´ëí°ì íµì íì¬ë ë¬´ììëê¹?"
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "ì½ëê° ìë ¥ ëì§ ìììµëë¤."
 
@@ -5227,10 +5450,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "ì·¨ì"
 
@@ -5308,34 +5529,40 @@ msgstr "ì¤í ì¤í¨"
 msgid "Notice with that id does not exist"
 msgstr "í´ë¹ idì íë¡íì´ ììµëë¤."
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "ì´ì©ìì ì§ìì ì¸ ê²ìê¸ì´ ììµëë¤."
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ì´ ì´ë©ì¼ ì£¼ìë¡ ì¬ì©ìë¥¼ ìë°ì´í¸ í  ì ììµëë¤."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "ì´ ì´ë©ì¼ ì£¼ìë¡ ì¬ì©ìë¥¼ ìë°ì´í¸ í  ì ììµëë¤."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "ì£ì¡í©ëë¤. ì´ ëªë ¹ì ìì§ ì¤íëì§ ìììµëë¤."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "ì°ë¬ ë³´ê¸°ë¥¼ ë³´ëìµëë¤."
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5343,200 +5570,204 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "ê²ìê¸ì´ ì¢ìíë ê¸ë¡ ì§ì ëììµëë¤."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "ë¹ì ì ì´ë¯¸ ì´ ê·¸ë£¹ì ë©¤ë²ìëë¤."
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "ê·¸ë£¹ %sì %së ê°ìí  ì ììµëë¤."
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s ë ê·¸ë£¹ %sì ê°ìíìµëë¤."
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "ì´ì©ì %1$s ì ê·¸ë£¹ %2$s ê°ìì ì¤í¨íìµëë¤."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "ê·¸ë£¹ %sìì %s ì¬ì©ìë¥¼ ì ê±°í  ì ììµëë¤."
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%sê° ê·¸ë£¹%së¥¼ ë ë¬ìµëë¤."
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "ì ì²´ì´ë¦: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "ìì¹: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "ííì´ì§: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "ìê¸°ìê°: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr "ë¹ì ì´ ë³´ë¸ ë©ìì§ê° ëë¬´ ê¸¸ì´ì. ìµë 140ê¸ìê¹ì§ìëë¤."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "%sìê² ë³´ë¸ ì§ì  ë©ìì§"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "ì§ì  ë©ìì§ ë³´ë´ê¸° ì¤ë¥."
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "ìë¦¼ì ì¼¤ ì ììµëë¤."
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "ì´ ê²ìê¸ ìì íê¸°"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "ê²ìê¸ì´ ë±ë¡ëììµëë¤."
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "íµì§ë¥¼ ì ì¥íëë° ë¬¸ì ê° ë°ìíìµëë¤."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "ë¹ì ì´ ë³´ë¸ ë©ìì§ê° ëë¬´ ê¸¸ì´ì. ìµë 140ê¸ìê¹ì§ìëë¤."
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "ì´ ê²ìê¸ì ëí´ ëµì¥íê¸°"
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "íµì§ë¥¼ ì ì¥íëë° ë¬¸ì ê° ë°ìíìµëë¤."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "êµ¬ëíë ¤ë ì¬ì©ìì ì´ë¦ì ì§ì íììì¤."
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "ë¹ì ì ì´ íë¡íì êµ¬ëëì§ ìê³ ììµëë¤."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "%sìê² êµ¬ëëììµëë¤."
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "êµ¬ëì í´ì íë ¤ë ì¬ì©ìì ì´ë¦ì ì§ì íììì¤."
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "%sìì êµ¬ëì í´ì íìµëë¤."
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "ëªë ¹ì´ ìì§ ì¤íëì§ ìììµëë¤."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "ìë¦¼ëê¸°."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "ìë¦¼ì ë ì ììµëë¤."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "ìë¦¼ì´ ì¼ì¡ìµëë¤."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "ìë¦¼ì ì¼¤ ì ììµëë¤."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "%sìì êµ¬ëì í´ì íìµëë¤."
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "ë¹ì ì ì´ íë¡íì êµ¬ëëì§ ìê³ ììµëë¤."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ë¹ì ì ë¤ì ì¬ì©ìë¥¼ ì´ë¯¸ êµ¬ëíê³  ììµëë¤."
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "ë¤ë¥¸ ì¬ëì êµ¬ë íì¤ ì ììµëë¤."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "ë¤ë¥¸ ì¬ëì êµ¬ë íì¤ ì ììµëë¤."
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "ë¹ì ì í´ë¹ ê·¸ë£¹ì ë©¤ë²ê° ìëëë¤."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ë¹ì ì í´ë¹ ê·¸ë£¹ì ë©¤ë²ê° ìëëë¤."
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6387,6 +6618,10 @@ msgstr "id ì¸ìê° ììµëë¤."
 msgid "Repeat this notice?"
 msgstr "ì´ ê²ìê¸ì ëí´ ëµì¥íê¸°"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "ë¤, ë§ìµëë¤."
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6586,47 +6821,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "ëª ì´ ì "
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "1ë¶ ì "
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%dë¶ ì "
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "1ìê° ì "
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "%dìê° ì "
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "íë£¨ ì "
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "%dì¼ ì "
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "1ë¬ ì "
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "%dë¬ ì "
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "1ë ì "
 
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 016d96c0e5..0a920ba8bd 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:46+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:21+0000\n"
 "Language-Team: Macedonian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: out-statusnet\n"
@@ -74,8 +74,13 @@ msgstr "ÐÐ°ÑÐ²Ð¾ÑÐµÐ½"
 msgid "Save access settings"
 msgstr "ÐÐ°ÑÑÐ²Ð°Ñ Ð½Ð°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ° Ð½Ð° Ð¿ÑÐ¸ÑÑÐ°Ð¿"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ÐÐ°ÑÑÐ²Ð°Ñ"
@@ -105,7 +110,7 @@ msgstr "ÐÐµÐ¼Ð° ÑÐ°ÐºÐ²Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ÐÐµÐ¼Ð° ÑÐ°ÐºÐ¾Ð² ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº."
@@ -348,7 +353,7 @@ msgstr "ÐÐµÐ¼Ð° Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½Ð¾ ÑÑÐ°ÑÑÑ ÑÐ¾ ÑÐ°ÐºÐ¾Ð² ID."
 msgid "This status is already a favorite."
 msgstr "ÐÐ²Ð¾Ñ ÑÑÐ°ÑÑÑ Ð²ÐµÑÐµ ÐÐ¸ Ðµ Ð¾Ð¼Ð¸Ð»ÐµÐ½."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° ÑÐ¾Ð·Ð´Ð°Ð´Ð°Ð¼ Ð¾Ð¼Ð¸Ð»Ð¸Ð½Ð° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°."
 
@@ -466,7 +471,7 @@ msgstr "ÐÑÑÐ¿Ð°ÑÐ° Ð½Ðµ Ðµ Ð¿ÑÐ¾Ð½Ð°ÑÐ´ÐµÐ½Ð°."
 msgid "You are already a member of that group."
 msgstr "ÐÐµÑÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð²Ð¾ ÑÐ°Ð° Ð³ÑÑÐ¿Ð°."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ð½Ð¸ ÑÑÐµ Ð¾Ð´ ÑÐ°Ð° Ð³ÑÑÐ¿Ð° Ð¾Ð´ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ñ."
 
@@ -517,17 +522,17 @@ msgid "Invalid token."
 msgstr "ÐÐ¾Ð³ÑÐµÑÐµÐ½ Ð¶ÐµÑÐ¾Ð½."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -560,12 +565,15 @@ msgstr "ÐÐµÑÐ¾Ð½Ð¾Ñ Ð½Ð° Ð±Ð°ÑÐ°ÑÐµÑÐ¾ %s Ðµ Ð¾Ð´Ð¾Ð±ÑÐµÐ½. ÐÐ°Ð¼ÐµÐ½Ðµ
 msgid "The request token %s has been denied and revoked."
 msgstr "ÐÐµÑÐ¾Ð½Ð¾Ñ Ð½Ð° Ð±Ð°ÑÐ°ÑÐµÑÐ¾ %s Ðµ Ð¾Ð´Ð±Ð¸ÐµÐ½ Ð¸ Ð¿Ð¾Ð½Ð¸ÑÑÐµÐ½."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "ÐÐµÐ¾ÑÐµÐºÑÐ²Ð°Ð½Ð¾ Ð¿Ð¾Ð´Ð½ÐµÑÑÐ²Ð°ÑÐµ Ð½Ð° Ð¾Ð±ÑÐ°Ð·ÐµÑ."
 
@@ -828,27 +836,44 @@ msgstr ""
 "Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ¸ Ð½Ð° ÐÐ°Ñ Ð²Ð¾ Ð¸Ð´Ð½Ð¸Ð½Ð°, Ð¸ Ð½ÐµÐ¼Ð° Ð´Ð° Ð±Ð¸Ð´ÐµÑÐµ Ð¸Ð·Ð²ÐµÑÑÐµÐ½Ð¸ Ð°ÐºÐ¾ Ð¸Ð¼Ð°ÑÐµ @-Ð¾Ð´Ð³Ð¾Ð²Ð¾ÑÐ¸ "
 "Ð¾Ð´ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "ÐÐµ"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "ÐÐµ Ð³Ð¾ Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ñ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ð²"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "ÐÐ°"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ñ Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ð²"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¸ ÑÐ½Ð¸Ð¼Ð°Ð¼ Ð¸Ð½Ð¾ÑÑÐ¼Ð°ÑÐ¸Ð¸ÑÐµ Ð·Ð° Ð±Ð»Ð¾ÐºÐ¾Ñ."
 
@@ -861,8 +886,8 @@ msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¸ ÑÐ½Ð¸Ð¼Ð°Ð¼ Ð¸Ð½Ð¾ÑÑÐ¼Ð°ÑÐ¸Ð¸ÑÐµ Ð·Ð° Ð±
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "ÐÐµÐ¼Ð° ÑÐ°ÐºÐ²Ð° Ð³ÑÑÐ¿Ð°."
 
@@ -921,16 +946,24 @@ msgstr "ÐÐµÐ¿Ð¾Ð·Ð½Ð°Ñ ÑÐ¸Ð¿ Ð½Ð° Ð°Ð´ÑÐµÑÐ° %s."
 msgid "That address has already been confirmed."
 msgstr "ÐÐ²Ð°Ð° Ð°Ð´ÑÐµÑÐ° Ð²ÐµÑÐµ Ðµ Ð¿Ð¾ÑÐ²ÑÐ´ÐµÐ½Ð°."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¾ Ð¿Ð¾Ð´Ð½Ð¾Ð²Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° ÑÐ° Ð¸Ð·Ð±ÑÐ¸ÑÐ°Ð¼ Ð¿Ð¾ÑÐ²ÑÐ´Ð°ÑÐ° Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑÑÐ°."
 
@@ -985,11 +1018,13 @@ msgstr ""
 "Ð¸Ð·Ð±ÑÐ¸ÑÐµ ÑÐ¸ÑÐµ Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐ¸ Ð·Ð° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¾Ñ Ð¾Ð´ Ð±Ð°Ð·Ð°ÑÐ°, Ð²ÐºÐ»ÑÑÑÐ²Ð°ÑÑÐ¸ Ð³Ð¸ ÑÐ¸ÑÐµ Ð¿Ð¾ÑÑÐ¾ÐµÑÐºÐ¸ "
 "Ð¿Ð¾Ð²ÑÐ·ÑÐ²Ð°ÑÐ°."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "ÐÐµ Ð³Ð¾ Ð±ÑÐ¸ÑÐ¸ Ð¾Ð²Ð¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "ÐÐ·Ð±ÑÐ¸ÑÐ¸ Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¾Ð²"
 
@@ -1024,11 +1059,13 @@ msgstr "ÐÑÐ¸ÑÐ¸ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°"
 msgid "Are you sure you want to delete this notice?"
 msgstr "ÐÐ°Ð»Ð¸ ÑÑÐµ ÑÐ¸Ð³ÑÑÐ½Ð¸ Ð´ÐµÐºÐ° ÑÐ°ÐºÐ°ÑÐµ Ð´Ð° ÑÐ° Ð¸Ð·Ð±ÑÐ¸ÑÐµÑÐµ Ð¾Ð²Ð°Ð° Ð·Ð°Ð±Ð»ÐµÑÐºÐ°?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "ÐÐµ ÑÐ° Ð±ÑÐ¸ÑÐ¸ Ð¾Ð²Ð°Ð° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "ÐÑÐ¸ÑÐ¸ ÑÐ° Ð¾Ð²Ð°Ð° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°"
 
@@ -1052,7 +1089,8 @@ msgstr ""
 "ÐÐ°Ð»Ð¸ ÑÐµ ÑÐ¸Ð³ÑÑÐ½Ð¸ Ð´ÐµÐºÐ° ÑÐ°ÐºÐ°ÑÐµ Ð´Ð° Ð³Ð¾ Ð¸Ð·Ð±ÑÐ¸ÑÐµÑÐµ Ð¾Ð²Ð¾Ñ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº? ÐÐ²Ð° Ð²Ð¾ÐµÐ´Ð½Ð¾ ÑÐµ Ð³Ð¸ "
 "Ð¸Ð·Ð±ÑÐ¸ÑÐµ ÑÐ¸ÑÐµ Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐ¸ Ð·Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð¾Ð´ Ð±Ð°Ð·Ð°ÑÐ°, Ð±ÐµÐ· Ð´Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð²ÑÐ°ÑÐ°Ñ."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "ÐÐ·Ð±ÑÐ¸ÑÐ¸ Ð¾Ð²Ð¾Ñ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº"
 
@@ -1165,15 +1203,13 @@ msgid "Reset back to default"
 msgstr "ÐÑÐ°ÑÐ¸ Ð¿Ð¾ Ð¾ÑÐ½Ð¾Ð²Ð½Ð¾"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ÐÐ°ÑÑÐ²Ð°Ñ"
 
@@ -1299,31 +1335,43 @@ msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐµ ÑÐ¾Ð·Ð´Ð°Ð´Ð°Ñ Ð°Ð»Ð¸ÑÐ°ÑÐ¸."
 msgid "Options saved."
 msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°ÑÐ° ÑÐµ Ð·Ð°ÑÑÐ²Ð°Ð½Ð¸."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ° Ð·Ð° Ðµ-Ð¿Ð¾ÑÑÐ°"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Ð Ð°ÐºÐ¾Ð²Ð¾Ð´ÐµÑÐµ ÑÐ¾ Ð½Ð°ÑÐ¸Ð½Ð¾Ñ Ð½Ð° ÐºÐ¾Ñ Ð´Ð¾Ð±Ð¸Ð²Ð°ÑÐµ Ðµ-Ð¿Ð¾ÑÑÐ° Ð¾Ð´ %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "ÐÐ´ÑÐµÑÐ°"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Ð-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Ð¢ÐµÐºÐ¾Ð²Ð½Ð° Ð¿Ð¾ÑÐ²ÑÐ´ÐµÐ½Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "ÐÑÑÑÑÐ°Ð½Ð¸"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1331,109 +1379,144 @@ msgstr ""
 "ÐÑÐµÐºÑÐ²Ð°Ð¼ Ð¿Ð¾ÑÐ²ÑÐ´Ð° Ð·Ð° Ð¾Ð²Ð°Ð° Ð°Ð´ÑÐµÑÐ°. ÐÑÐ¾Ð²ÐµÑÐµÑÐµ ÑÐ¸ Ð³Ð¾ Ð¿ÑÐ¸ÐµÐ¼Ð½Ð¾ÑÐ¾ ÑÐ°Ð½Ð´Ð°ÑÐµ (Ð° Ð¸ "
 "ÑÐ°Ð½Ð´Ð°ÑÐµÑÐ¾ Ð·Ð° ÑÐ¿Ð°Ð¼!). ÐÐ¾ Ð¿Ð¸ÑÐ¼Ð¾ÑÐ¾ ÑÐµ ÑÐ»ÐµÐ´Ð°Ñ Ð¿Ð¾Ð½Ð°ÑÐ°Ð¼Ð¾ÑÐ½Ð¸ Ð½Ð°Ð¿Ð°ÑÑÑÐ²Ð¸ÑÐ°."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ÐÑÐºÐ°Ð¶Ð¸"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Ð-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Ð-Ð¿Ð¾ÑÑÐ°, Ð¾Ð´ Ð¾Ð±Ð»Ð¸ÐºÐ¾Ñ âUserName@example.orgâ"
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "ÐÐ¾Ð´Ð°Ñ"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ÐÑÐ¸ÐµÐ¼Ð½Ð° Ð¿Ð¾ÑÑÐ°"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°ÑÑÐµ Ðµ-Ð¿Ð¾ÑÑÐ° Ð½Ð° Ð¾Ð²Ð°Ð° Ð°Ð´ÑÐµÑÐ° Ð·Ð° Ð´Ð° Ð¾Ð±ÑÐ°Ð²ÑÐ²Ð°ÑÐµ Ð½Ð¾Ð²Ð¸ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ¸."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Ð¡Ð¾Ð·Ð´Ð°Ñ Ð½Ð¾Ð²Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ° Ð·Ð° Ð¿ÑÐ¸Ð¼Ð°ÑÐµ Ð¾Ð±ÑÐ°Ð²Ð¸; ÑÐ° Ð·Ð°Ð¼ÐµÐ½ÑÐ²Ð° ÑÑÐ°ÑÐ°ÑÐ° Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "ÐÐ¾Ð²Ð¾"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ð¸Ð·Ð²ÐµÑÑÑÐ²Ð°ÑÐ° Ð·Ð° Ð½Ð¾Ð²Ð¸ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ¸ Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑÑÐ°."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ðµ-Ð¿Ð¾ÑÑÐ° ÐºÐ¾Ð³Ð° Ð½ÐµÐºÐ¾Ñ ÑÐµ Ð´Ð¾Ð´Ð°Ð´Ðµ Ð¼Ð¾ÑÐ° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ° ÐºÐ°ÐºÐ¾ Ð¾Ð¼Ð¸Ð»ÐµÐ½Ð°."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ðµ-Ð¿Ð¾ÑÑÐ° ÐºÐ¾Ð³Ð° Ð½ÐµÐºÐ¾Ñ ÑÐµ Ð¼Ð¸ Ð¸ÑÐ¿ÑÐ°ÑÐ¸ Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ð° Ð¿Ð¾ÑÐ°ÐºÐ°."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ðµ-Ð¿Ð¾ÑÑÐ° ÐºÐ¾Ð³Ð° Ð½ÐµÐºÐ¾Ñ ÑÐµ Ð¼Ð¸ Ð¸ÑÐ¿ÑÐ°ÑÐ¸ â@-Ð¾Ð´Ð³Ð¾Ð²Ð¾Ñâ"
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸ Ð¸Ð¼ Ð½Ð° Ð¿ÑÐ¸ÑÐ°ÑÐµÐ»Ð¸ÑÐµ Ð´Ð° Ð¼Ð¾Ð¶Ð°Ñ Ð´Ð° Ð¼Ðµ Ð¿Ð¾Ð´Ð±ÑÑÐ½ÑÐ²Ð°Ð°Ñ Ð¸ Ð´Ð° Ð¼Ð¸ Ð¸ÑÐ¿ÑÐ°ÑÐ°Ð°Ñ Ðµ-"
 "Ð¿Ð¾ÑÑÐ°."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Ð¡Ð°ÐºÐ°Ð¼ Ð´Ð° Ð¾Ð±ÑÐ°Ð²ÑÐ²Ð°Ð¼ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ¸ Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑÑÐ°."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "ÐÐ±ÑÐ°Ð²Ð¸ MicroID Ð·Ð° Ð¼Ð¾ÑÐ°ÑÐ° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°ÑÐ° ÑÐµ Ð·Ð°ÑÑÐ²Ð°Ð½Ð¸."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "ÐÐµÐ¼Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "ÐÐµÐ¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° ÑÐ° Ð½Ð¾ÑÐ¼Ð°Ð»Ð¸Ð·Ð¸ÑÐ°Ð¼ ÑÐ°Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»Ð½Ð° Ð°Ð´ÑÐµÑÐ° Ð·Ð° Ðµ-Ð¿Ð¾ÑÑÐ°."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "ÐÐ²Ð°Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ° Ðµ Ð²ÐµÑÐµ ÐÐ°ÑÐ°."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Ð¢Ð°Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ° Ðµ Ð²ÐµÑÐµ Ð·Ð°ÑÐ°ÑÐµÐ½Ð° Ð¾Ð´ Ð´ÑÑÐ³ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÐÐ¾Ð´Ð¾Ñ Ð·Ð° Ð¿Ð¾ÑÐ²ÑÐ´Ð° Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð²Ð½ÐµÑÐµ."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1442,43 +1525,56 @@ msgstr ""
 "ÑÐ°Ð½Ð´Ð°ÑÐµÑÐ¾ Ð·Ð° Ð´Ð¾Ð±Ð¸ÐµÐ½Ð¸ Ð¿Ð¸ÑÐ¼Ð° (Ð° Ð¸ ÑÐ°Ð½Ð´Ð°ÑÐµÑÐ¾ Ð·Ð° ÑÐ¿Ð°Ð¼!) Ð·Ð° Ð´Ð° Ð³Ð¾ Ð²Ð¸Ð´Ð¸ÑÐµ ÐºÐ¾Ð´Ð¾Ñ Ð¸ "
 "Ð½Ð°Ð¿Ð°ÑÑÑÐ²Ð¸ÑÐ°ÑÐ° Ð·Ð° Ð½ÐµÐ³Ð¾Ð²Ð¾ ÐºÐ¾ÑÐ¸ÑÑÐµÑÐµ."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ÐÐµÐ¼Ð° Ð¿Ð¾ÑÐ²ÑÐ´Ð¸ ÐºÐ¾Ð¸ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð¾ÑÐºÐ°Ð¶Ð°Ñ."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "ÐÐ²Ð° Ðµ Ð¿Ð¾Ð³ÑÐµÑÐ½Ð°ÑÐ° IM Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "ÐÐ¾ÑÐ²ÑÐ´Ð°ÑÐ° Ðµ Ð¾ÑÐºÐ°Ð¶Ð°Ð½Ð°"
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "ÐÐ²Ð° Ð½Ðµ Ðµ ÐÐ°ÑÐ°ÑÐ° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "ÐÐ´ÑÐµÑÐ°ÑÐ° Ðµ Ð¾ÑÑÑÑÐ°Ð½ÐµÑÐ°."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÐÐµÐ¼Ð° Ð¿ÑÐ¸ÐµÐ¼Ð½Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° ÑÐ° Ð¿Ð¾Ð´Ð½Ð¾Ð²Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐºÐ°ÑÐ° ÐµÐ²Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ°."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ÐÑÐ¸ÐµÐ¼Ð½Ð°ÑÐ° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ° Ðµ Ð¾ÑÑÑÑÐ°Ð½ÐµÑÐ°."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ÐÐ¾Ð´Ð°Ð´ÐµÐ½Ð° Ðµ Ð½Ð¾Ð²Ð° Ð²Ð»ÐµÐ·Ð½Ð° Ðµ-Ð¿Ð¾ÑÑÐµÐ½ÑÐºÐ° Ð°Ð´ÑÐµÑÐ°."
 
@@ -1669,15 +1765,17 @@ msgstr ""
 "$sâ? ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ ÑÐµ Ð±Ð¸Ð´Ðµ Ð¾ÑÑÑÑÐ°Ð½ÐµÑ Ð¾Ð´ Ð³ÑÑÐ¿Ð°ÑÐ°, Ð¸ Ð²Ð¾ Ð¸Ð´Ð½Ð¸Ð½Ð° Ð½ÐµÐ¼Ð° Ð´Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° "
 "Ð¾Ð±ÑÐ°Ð²ÑÐ²Ð° Ð²Ð¾ ÑÐ°Ð° Ð³ÑÑÐ¿Ð° Ð¸ Ð´Ð° ÑÐµ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ° Ð½Ð° Ð½ÐµÐ°."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "ÐÐµ Ð³Ð¾ Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ñ Ð¾Ð²Ð¾Ñ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº Ð¾Ð´ Ð¾Ð²Ð°Ð° Ð³ÑÑÐ¿Ð°"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "ÐÐ»Ð¾ÐºÐ¸ÑÐ°Ñ Ð³Ð¾ Ð¾Ð²Ð¾Ñ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº Ð¾Ð´ Ð¾Ð²Ð°Ð° Ð³ÑÑÐ¿Ð°"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 "Ð¡Ðµ Ð¿Ð¾ÑÐ°Ð²Ð¸ Ð³ÑÐµÑÐºÐ° Ð²Ð¾ Ð±Ð°Ð·Ð°ÑÐ° Ð½Ð°Ð¿Ð¾Ð´Ð°ÑÐ¾ÑÐ¸ Ð¿ÑÐ¸ Ð±Ð»Ð¾ÐºÐ¸ÑÐ°ÑÐµÑÐ¾ Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð¾Ð´ "
@@ -1863,11 +1961,15 @@ msgstr "ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð½Ðµ Ðµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ°Ð½ Ð¾Ð´ Ð³ÑÑÐ¿Ð°ÑÐ°."
 msgid "Error removing the block."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÑÑÑÐ°Ð½ÑÐ²Ð°ÑÐµ Ð½Ð° Ð±Ð»Ð¾ÐºÐ¾Ñ."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ° Ð·Ð° IM"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1876,15 +1978,24 @@ msgstr ""
 "ÐÐ¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿ÑÐ¸Ð¼Ð°ÑÐµ Ð¸ Ð¿ÑÐ°ÑÐ°ÑÐµ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ¸ Ð¿ÑÐµÐºÑ Jabber/GTalk [Ð±ÑÐ·Ð¸ Ð¿Ð¾ÑÐ°ÐºÐ¸](%%doc."
 "im%%). ÐÐ¾Ð´Ð¾Ð»Ñ "
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "IM Ðµ Ð½ÐµÐ´Ð¾ÑÑÐ°Ð¿Ð½Ð¾."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM Ð°Ð´ÑÐµÑÐ°"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ÐÐ¾Ð¼ÐµÐ½ÑÐ°Ð»Ð½Ð¾ Ð¿Ð¾ÑÐ²ÑÐ´ÐµÐ½Ð° Jabber/GTalk Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1894,11 +2005,9 @@ msgstr ""
 "Ð¿Ð¾ÑÐ°ÐºÐ° ÑÐ¾ Ð¿Ð¾Ð½Ð°ÑÐ°Ð¼Ð¾ÑÐ½Ð¸ Ð¸Ð½ÑÑÑÑÐºÑÐ¸Ð¸. (ÐÐ°Ð»Ð¸ Ð³Ð¾ Ð´Ð¾Ð´Ð°Ð´Ð¾Ð²ÑÐµ %s Ð½Ð° ÐÐ°ÑÐ°ÑÐ° Ð»Ð¸ÑÑÐ° ÑÐ¾ "
 "Ð¿ÑÐ¸ÑÐ°ÑÐµÐ»Ð¸?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM Ð°Ð´ÑÐµÑÐ°"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1907,44 +2016,66 @@ msgstr ""
 "Jabber Ð¸Ð»Ð¸ GTalk Ð°Ð´ÑÐµÑÐ° ÐºÐ°ÐºÐ¾ âime@example.orgâ. ÐÐ¾ Ð¿ÑÐ²Ð¾ Ð´Ð¾Ð´Ð°ÑÑÐµ Ð³Ð¾ %s Ð²Ð¾ "
 "ÐÐ°ÑÐ°ÑÐ° ÐºÐ¾Ð½ÑÐ°ÐºÑ Ð»Ð¸ÑÑÐ° Ð²Ð¾ ÐÐ°ÑÐ¸Ð¾Ñ IM ÐºÐ»Ð¸ÐµÐ½Ñ Ð¸Ð»Ð¸ GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ¸ Ð¿ÑÐµÐºÑ Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "ÐÐ±ÑÐ°Ð²ÑÐ²Ð°Ñ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ° ÐºÐ¾Ð³Ð° Ð¼Ð¾ÑÐ¾Ñ ÑÑÐ°ÑÑÑ Ð½Ð° Jabber/GTalk ÑÐµ ÑÐµ Ð¿ÑÐ¾Ð¼ÐµÐ½Ð¸."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ð¾Ð´Ð³Ð¾Ð²Ð¾ÑÐ¸ Ð¿ÑÐµÐºÑ Jabber/GTalk Ð¾Ð´ Ð»ÑÑÐµ Ð½Ð° ÐºÐ¾Ð¸ Ð½Ðµ ÑÑÐ¼ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐµÐ½."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ÐÐ±ÑÐ°Ð²Ð¸ MicroID Ð·Ð° Ð¼Ð¾ÑÐ°ÑÐ° Ð°Ð´ÑÐµÑÐ° Ð½Ð° Jabber/GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°ÑÐ° ÑÐµ Ð·Ð°ÑÑÐ²Ð°Ð½Ð¸."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "ÐÐµÐ¼Ð° JabberID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÐÐ²Ð° JabberID Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ Ð½Ð¾ÑÐ¼Ð°Ð»Ð¸Ð·Ð¸ÑÐ°."
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÐµÐ½ JabberID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "ÐÐ²Ð° Ð²ÐµÑÐµ Ðµ ÐÐ°ÑÐ¸Ð¾Ñ Jabber ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "ÐÐ²Ð° Jabber ID Ð¼Ñ Ð¿ÑÐ¸Ð¿Ð°ÑÐ° Ð½Ð° Ð´ÑÑÐ³ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1953,10 +2084,35 @@ msgstr ""
 "ÐÑÐ¿ÑÐ°ÑÐ¸Ð²Ð¼Ðµ ÐºÐ¾Ð´ Ð·Ð° Ð¿Ð¾ÑÐ²ÑÐ´Ð° Ð½Ð° IM Ð°Ð´ÑÐµÑÐ°ÑÐ° ÑÑÐ¾ ÑÐ° Ð´Ð¾Ð´Ð°Ð´Ð¾Ð²ÑÐµ. ÐÐ¾ÑÐ° Ð´Ð° Ð³Ð¾ "
 "Ð¾Ð´Ð¾Ð±ÑÐ¸ÑÐµ %S Ð·Ð° Ð´Ð° Ð²Ð¸ Ð¸ÑÐ¿ÑÐ°ÑÐ° Ð¿Ð¾ÑÐ°ÐºÐ¸."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "ÐÐ²Ð° Ðµ Ð¿Ð¾Ð³ÑÐµÑÐ½Ð°ÑÐ° IM Ð°Ð´ÑÐµÑÐ°."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° ÑÐ° Ð¸Ð·Ð±ÑÐ¸ÑÐ°Ð¼ Ð¿Ð¾ÑÐ²ÑÐ´Ð°ÑÐ° Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑÑÐ°."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "ÐÐ¾ÑÐ²ÑÐ´Ð°ÑÐ° Ðµ Ð¾ÑÐºÐ°Ð¶Ð°Ð½Ð°"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "ÐÐ²Ð° Ð½Ðµ Ðµ ÐÐ°ÑÐ¸Ð¾Ñ Jabber ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "ÐÐ´ÑÐµÑÐ°ÑÐ° Ðµ Ð¾ÑÑÑÑÐ°Ð½ÐµÑÐ°."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2000,7 +2156,9 @@ msgstr "ÐÐ¾ÐºÐ°Ð½Ð¸ Ð½Ð¾Ð²Ð¸ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸"
 msgid "You are already subscribed to these users:"
 msgstr "ÐÐµÑÐµ ÑÑÐµ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐµÐ½Ð¸ Ð½Ð° Ð¾Ð²Ð¸Ðµ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2124,7 +2282,9 @@ msgstr "ÐÐ¾ÑÐ° Ð´Ð° ÑÑÐµ Ð½Ð°ÑÐ°Ð²ÐµÐ½Ð¸ Ð·Ð° Ð´Ð° Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐµ 
 msgid "No nickname or ID."
 msgstr "ÐÐµÐ¼Ð° Ð¿ÑÐµÐºÐ°Ñ Ð¸Ð»Ð¸ ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ÑÐµ Ð·Ð°ÑÐ»ÐµÐ½Ð¸ Ð²Ð¾ Ð³ÑÑÐ¿Ð°ÑÐ° %2$s"
@@ -2133,11 +2293,13 @@ msgstr "%1$s ÑÐµ Ð·Ð°ÑÐ»ÐµÐ½Ð¸ Ð²Ð¾ Ð³ÑÑÐ¿Ð°ÑÐ° %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "ÐÐ¾ÑÐ° Ð´Ð° ÑÑÐµ Ð½Ð°ÑÐ°Ð²ÐµÐ½Ð¸ Ð·Ð° Ð´Ð° Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐ° Ð½Ð°Ð¿ÑÑÑÐ¸ÑÐµ Ð³ÑÑÐ¿Ð°ÑÐ°."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "ÐÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð²Ð¾ ÑÐ°Ð° Ð³ÑÑÐ¿Ð°."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s ÑÐ° Ð½Ð°Ð¿ÑÑÑÐ¸ Ð³ÑÑÐ¿Ð°ÑÐ° %2$s"
@@ -2248,12 +2410,12 @@ msgstr "ÐÐ²Ð¾Ñ Ð¾Ð±ÑÐ°Ð·ÐµÑ ÑÐ»ÑÐ¶Ð¸ Ð·Ð° ÑÐ¾Ð·Ð´Ð°Ð²Ð°ÑÐµ Ð½Ð¾Ð²Ð° Ð³Ñ
 msgid "New message"
 msgstr "ÐÐ¾Ð²Ð° Ð¿Ð¾ÑÐ°ÐºÐ°"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¸ÑÐ¿ÑÐ°ÑÐ¸ÑÐµ Ð¿Ð¾ÑÐ°ÐºÐ° Ð´Ð¾ Ð¾Ð²Ð¾ÑÐ¾ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "ÐÐµÐ¼Ð° ÑÐ¾Ð´ÑÐ¶Ð¸Ð½Ð°!"
 
@@ -2261,7 +2423,7 @@ msgstr "ÐÐµÐ¼Ð° ÑÐ¾Ð´ÑÐ¶Ð¸Ð½Ð°!"
 msgid "No recipient specified."
 msgstr "ÐÐµÐ¼Ð° Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¾ Ð¿ÑÐ¸Ð¼Ð°Ñ."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2522,7 +2684,7 @@ msgid "6 or more characters"
 msgstr "6 Ð¸Ð»Ð¸ Ð¿Ð¾Ð²ÐµÑÐµ Ð·Ð½Ð°ÑÐ¸"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "ÐÐ¾ÑÐ²ÑÐ´Ð¸"
 
@@ -3923,45 +4085,75 @@ msgstr ""
 msgid "Save site notice"
 msgstr "ÐÐ°ÑÑÐ²Ð°Ñ ÑÐ° Ð¾Ð±ÑÐ°Ð²Ð°Ð²Ð°"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ° Ð·Ð° Ð¡ÐÐ¡"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "ÐÐ¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿ÑÐ¸Ð¼Ð°ÑÐµ Ð¡ÐÐ¡ Ð¿Ð¾ÑÐ°ÐºÐ¸ Ð¿Ð¾ Ðµ-Ð¿Ð¾ÑÑÐ° Ð¾Ð´ %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "Ð¡ÐÐ¡-Ð¿Ð¾ÑÐ°ÐºÐ¸ÑÐµ ÑÐµ Ð½ÐµÐ´Ð¾ÑÑÐ°Ð¿Ð½Ð¸."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM Ð°Ð´ÑÐµÑÐ°"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Ð¢ÐµÐºÐ¾Ð²ÐµÐ½ Ð¿Ð¾ÑÐ²ÑÐ´ÐµÐ½ ÑÐµÐ»ÐµÑÐ¾Ð½ÑÐºÐ¸ Ð±ÑÐ¾Ñ ÑÐ¾ Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ Ð·Ð° Ð¡ÐÐ¡."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "ÐÑÐµÐºÑÐ²Ð°Ð¼ Ð¿Ð¾ÑÐ²ÑÐ´Ð° Ð·Ð° Ð¾Ð²Ð¾Ñ ÑÐµÐ»ÐµÑÐ¾Ð½ÑÐºÐ¸ Ð±ÑÐ¾Ñ."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "ÐÐ¾ÑÐ²ÑÐ´ÐµÐ½ ÐºÐ¾Ð´"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "ÐÐ½ÐµÑÐµÑÐµ Ð³Ð¾ ÐºÐ¾Ð´Ð¾Ñ ÑÑÐ¾ Ð³Ð¾ Ð´Ð¾Ð±Ð¸Ð²ÑÐµ Ð¿Ð¾ ÑÐµÐ»ÐµÑÐ¾Ð½."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "ÐÐ¾ÑÐ²ÑÐ´Ð¸"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "Ð¢ÐµÐ»ÐµÑÐ¾Ð½ÑÐºÐ¸ Ð±ÑÐ¾Ñ Ð·Ð° Ð¡ÐÐ¡"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 "Ð¢ÐµÐ»ÐµÑÐ¾Ð½ÑÐºÐ¸ Ð±ÑÐ¾Ñ, Ð±ÐµÐ· Ð¸Ð½ÑÐµÑÐ¿ÑÐ½ÐºÑÐ¸ÑÐºÐ¸ Ð·Ð½Ð°ÑÐ¸ Ð¸ Ð¿ÑÐ°Ð·Ð½Ð¸ Ð¼ÐµÑÑÐ°, ÑÐ¾ Ð¿Ð¾Ð²Ð¸ÐºÑÐ²Ð°ÑÐºÐ¸ ÐºÐ¾Ð´"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3969,23 +4161,34 @@ msgstr ""
 "ÐÑÐ¿ÑÐ°ÑÐ°Ñ Ð¼Ð¸ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ¸ Ð¿Ð¾ Ð¡ÐÐ¡; ÑÐ°Ð·Ð±ÑÐ°Ð¼ Ð´ÐµÐºÐ° Ð¾Ð²Ð° Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð´Ð¾Ð²ÐµÐ´Ðµ Ð´Ð¾ Ð¿ÑÐµÐºÑÐ¼ÐµÑÐ½Ð¸ "
 "ÑÑÐ¾ÑÐ¾ÑÐ¸."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "ÐÐ°Ð³Ð¾Ð´ÑÐ²Ð°ÑÐ°ÑÐ° ÑÐµ Ð·Ð°ÑÑÐ²Ð°Ð½Ð¸."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "ÐÐµÐ¼Ð° ÑÐµÐ»ÐµÑÐ¾Ð½ÑÐºÐ¸ Ð±ÑÐ¾Ñ."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "ÐÐµÐ¼Ð°ÑÐµ Ð¸Ð·Ð±ÑÐ°Ð½Ð¾ Ð¾Ð¿ÐµÑÐ°ÑÐ¾Ñ."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "ÐÐ²Ð° Ð¸ ÑÐµÐ³Ð° Ðµ ÐÐ°ÑÐ¸Ð¾Ñ ÑÐµÐ»ÐµÑÐ¾Ð½ÑÐºÐ¸ Ð±ÑÐ¾Ñ."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Ð¢Ð¾Ñ ÑÐµÐ»ÐµÑÐ¾Ð½ÑÐºÐ¸ Ð±ÑÐ¾Ñ Ðµ Ð²ÐµÑÐµ Ð²Ð¾ ÑÐ¿Ð¾ÑÑÐµÐ±Ð° Ð¾Ð´ Ð´ÑÑÐ³ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -3993,23 +4196,42 @@ msgstr ""
 "ÐÐ° ÑÐµÐ»ÐµÑÐ¾Ð½ÑÐºÐ¸Ð¾Ñ Ð±ÑÐ¾Ñ ÑÑÐ¾ Ð³Ð¾ Ð´Ð¾Ð´Ð°Ð´Ð¾Ð²ÑÐµ Ðµ Ð¸ÑÐ¿ÑÐ°ÑÐµÐ½ Ð¿Ð¾ÑÐ²ÑÐ´ÐµÐ½ ÐºÐ¾Ð´. ÐÑÐ¾Ð²ÐµÑÐµÑÐµ ÑÐ¸ "
 "Ð³Ð¾ ÑÐµÐ»ÐµÑÐ¾Ð½Ð¾Ñ Ð·Ð° Ð´Ð° Ð³Ð¾ Ð²Ð¸Ð´Ð¸ÑÐµ ÐºÐ¾Ð´Ð¾Ñ, Ð·Ð°ÐµÐ´Ð½Ð¾ ÑÐ¾ Ð½Ð°Ð¿Ð°ÑÑÑÐ²Ð¸ÑÐ° Ð·Ð° Ð½ÐµÐ³Ð¾Ð²Ð° ÑÐ¿Ð¾ÑÑÐµÐ±Ð°."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "ÐÐ²Ð° Ðµ Ð¿Ð¾Ð³ÑÐµÑÐµÐ½ Ð¿Ð¾ÑÐ²ÑÐ´ÐµÐ½ Ð±ÑÐ¾Ñ."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "ÐÐ¾ÑÐ²ÑÐ´Ð°ÑÐ° Ðµ Ð¾ÑÐºÐ°Ð¶Ð°Ð½Ð°"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Ð¢Ð¾Ð° Ð½Ðµ Ðµ ÐÐ°ÑÐ¸Ð¾Ñ ÑÐµÐ»ÐµÑÐ¾Ð½ÑÐºÐ¸ Ð±ÑÐ¾Ñ."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Ð¢ÐµÐ»ÐµÑÐ¾Ð½ÑÐºÐ¸ Ð±ÑÐ¾Ñ Ð·Ð° Ð¡ÐÐ¡"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "ÐÐ¾Ð±Ð¸Ð»ÐµÐ½ Ð¾Ð¿ÐµÑÐ°ÑÐ¾Ñ"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "ÐÐ·Ð±ÐµÑÐµÑÐµ Ð¾Ð¿ÐµÑÐ°ÑÐ¾Ñ"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4018,7 +4240,8 @@ msgstr ""
 "ÐÐ¾Ð±Ð¸Ð»ÐµÐ½ Ð¾Ð¿ÐµÑÐ°ÑÐ¾Ñ Ð·Ð° ÑÐµÐ»ÐµÑÐ¾Ð½Ð¾Ñ. ÐÐºÐ¾ Ð·Ð½Ð°ÐµÑÐµ Ð¾Ð¿ÐµÑÐ°ÑÐ¾Ñ ÑÑÐ¾ Ð¿ÑÐ¸ÑÐ°ÑÐ° Ð¡ÐÐ¡ Ð¿ÑÐµÐºÑ Ðµ-"
 "Ð¿Ð¾ÑÑÐ°, Ð½Ð¾ Ð½Ðµ ÑÐ¸Ð³ÑÑÐ¸ÑÐ° Ð¾Ð²Ð´Ðµ, Ð¸Ð·Ð²ÐµÑÑÐµÑÐµ Ð½Ã¨ Ð½Ð° %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "ÐÐµÐ¼Ð° Ð²Ð½ÐµÑÐµÐ½Ð¾ ÐºÐ¾Ð´"
 
@@ -5220,10 +5443,8 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "ÐÑÐ½Ð¾Ð²Ð½Ð¾-Ð·Ð°Ð´Ð°Ð´ÐµÐ½ Ð¿ÑÐ¸ÑÑÐ°Ð¿ Ð·Ð° Ð¾Ð²Ð¾Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼: ÑÐ°Ð¼Ð¾ ÑÐ¸ÑÐ°ÑÐµ, Ð¸Ð»Ð¸ ÑÐ¸ÑÐ°ÑÐµ-Ð¿Ð¸ÑÑÐ²Ð°ÑÐµ"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "ÐÑÐºÐ°Ð¶Ð¸"
 
@@ -5299,34 +5520,40 @@ msgstr "ÐÐ°ÑÐµÐ´Ð±Ð°ÑÐ° Ð½Ðµ ÑÑÐ¿ÐµÐ°"
 msgid "Notice with that id does not exist"
 msgstr "ÐÐµ Ð¿Ð¾ÑÑÐ¾Ð¸ Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ° ÑÐ¾ ÑÐ°ÐºÐ¾Ð² id"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "ÐÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð½ÐµÐ¼Ð° Ð¿Ð¾ÑÐ»ÐµÐ´Ð½Ð° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð¿ÑÐ¾Ð½Ð°ÑÐ´Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº ÑÐ¾ Ð¿ÑÐµÐºÐ°Ñ %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð¿ÑÐ¾Ð½Ð°ÑÐ´Ð°Ð¼ Ð»Ð¾ÐºÐ°Ð»ÐµÐ½ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸Ðº ÑÐ¾ Ð¿ÑÐµÐºÐ°Ñ %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "ÐÐ°Ð»Ð¸Ð¼Ðµ, Ð¾Ð²Ð°Ð° Ð½Ð°ÑÐµÐ´Ð±Ð° ÑÃ¨ ÑÑÑÐµ Ð½Ðµ Ðµ Ð¸Ð¼Ð¿Ð»ÐµÐ¼ÐµÐ½ÑÐ¸ÑÐ°Ð½Ð°."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "ÐÐµÐ¼Ð° Ð±Ð°Ñ Ð»Ð¾Ð³Ð¸ÐºÐ° Ð´Ð° ÑÐµ Ð¿Ð¾Ð´Ð±ÑÑÐ½ÑÐ²Ð°ÑÐµ ÑÐ°Ð¼Ð¸ ÑÐµÐ±ÐµÑÐ¸."
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "ÐÑÐ¿ÑÐ°ÑÐµÐ½Ð¾ Ð¿Ð¾Ð´Ð±ÑÑÐ½ÑÐ²Ð°ÑÐµ Ð½Ð° %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5337,57 +5564,55 @@ msgstr ""
 "ÐÑÐµÑÐ¿Ð»Ð°ÑÐ½Ð¸ÑÐ¸: %2$s\n"
 "ÐÐ°Ð±ÐµÐ»ÐµÑÐºÐ¸: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "ÐÐ°Ð±ÐµÐ»ÐµÑÐºÐ°ÑÐ° Ðµ Ð¾Ð±ÐµÐ»ÐµÐ¶Ð°Ð½Ð° ÐºÐ°ÐºÐ¾ Ð¾Ð¼Ð¸Ð»ÐµÐ½Ð°."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "ÐÐµÑÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð²Ð¾ ÑÐ°Ð° Ð³ÑÑÐ¿Ð°"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¾ Ð·Ð°ÑÐ»ÐµÐ½Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ %s Ð²Ð¾ Ð³ÑÑÐ¿Ð°ÑÐ° %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s ÑÐµ Ð·Ð°ÑÐ»ÐµÐ½Ð¸ Ð²Ð¾ Ð³ÑÑÐ¿Ð°ÑÐ° %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° Ð³Ð¾ Ð·Ð°ÑÐ»ÐµÐ½Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ %1$s Ð²Ð¾ Ð³ÑÑÐ¿Ð°ÑÐ° 2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÐ² Ð´Ð° Ð³Ð¾ Ð¾ÑÑÑÑÐ°Ð½Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ %s Ð¾Ð´ Ð³ÑÑÐ¿Ð°ÑÐ° %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s ÑÐ° Ð½Ð°Ð¿ÑÑÑÐ¸ Ð³ÑÑÐ¿Ð°ÑÐ° %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "ÐÐ¼Ðµ Ð¸ Ð¿ÑÐµÐ·Ð¸Ð¼Ðµ: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "ÐÐ¾ÐºÐ°ÑÐ¸ÑÐ°: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "ÐÐ¾Ð¼Ð°ÑÐ½Ð° ÑÑÑÐ°Ð½Ð¸ÑÐ°: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "ÐÐ°: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5396,141 +5621,147 @@ msgstr ""
 "%s Ðµ Ð´Ð°Ð»ÐµÑÐ¸Ð½ÑÐºÐ¸ Ð¿ÑÐ¾ÑÐ¸Ð»; Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿ÑÐ°ÑÐ°ÑÐµ Ð´Ð¸ÑÐµÐºÑÐ½Ð¸ Ð¿Ð¾ÑÐ°ÐºÐ¸ ÑÐ°Ð¼Ð¾ Ð´Ð¾ ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÑÐ¸ "
 "Ð½Ð° Ð¸ÑÑÐ¸Ð¾Ñ ÑÐµÑÐ²ÐµÑ."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
-"ÐÐ¾ÑÐ°ÐºÐ°ÑÐ° Ðµ Ð¿ÑÐµÐ´Ð¾Ð»Ð³Ð° - Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸ ÑÐµ Ð½Ð°ÑÐ²ÐµÑÐµ %d Ð·Ð½Ð°ÑÐ¸, Ð° Ð²Ð¸Ðµ Ð¸ÑÐ¿ÑÐ°ÑÐ¸Ð²ÑÐµ %d"
+"ÐÐ¾ÑÐ°ÐºÐ°ÑÐ° Ðµ Ð¿ÑÐµÐ´Ð¾Ð»Ð³Ð° - Ð´Ð¾Ð·Ð²Ð¾Ð»ÐµÐ½Ð¸ ÑÐµ Ð½Ð°ÑÐ²ÐµÑÐµ %1$d Ð·Ð½Ð°ÑÐ¸, Ð° Ð²Ð¸Ðµ Ð¸ÑÐ¿ÑÐ°ÑÐ¸Ð²ÑÐµ %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "ÐÐ¸ÑÐµÐºÑÐ½Ð°ÑÐ° Ð¿Ð¾ÑÐ°ÐºÐ° Ð´Ð¾ %s Ðµ Ð¸ÑÐ¿ÑÐ°ÑÐµÐ½Ð°"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "ÐÑÐ°ÑÐºÐ° Ð¿ÑÐ¸ Ð¸ÑÐ¿Ð°ÑÐ°ÑÐµÑÐ¾ Ð½Ð° Ð´Ð¸ÑÐµÐºÑÐ½Ð°ÑÐ° Ð¿Ð¾ÑÐ°ÐºÐ°."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° Ð¿Ð¾Ð²ÑÐ¾ÑÑÐ²Ð°ÑÐµ ÑÐ¾Ð¿ÑÑÐ²ÐµÐ½Ð¸ Ð·Ð°Ð±Ð°Ð»ÐµÑÐºÐ¸"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "ÐÐ²Ð°Ð° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ° Ðµ Ð²ÐµÑÐµ Ð¿Ð¾Ð²ÑÐ¾ÑÐµÐ½Ð°"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "ÐÐ°Ð±ÐµÐ»ÐµÑÐºÐ°ÑÐ° Ð¾Ð´ %s Ðµ Ð¿Ð¾Ð²ÑÐ¾ÑÐµÐ½Ð°"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾Ð²ÑÐ¾ÑÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð±ÐµÐ»ÐµÑÐºÐ°ÑÐ°."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 "ÐÐ°Ð±ÐµÐ»ÐµÑÐºÐ°ÑÐ° Ðµ Ð¿ÑÐµÐ´Ð¾Ð»Ð³Ð° - ÑÑÐµÐ±Ð° Ð´Ð° Ð½ÐµÐ¼Ð° Ð¿Ð¾Ð²ÐµÑÐµ Ð¾Ð´ %d Ð·Ð½Ð°ÑÐ¸, Ð° ÐÐ¸Ðµ Ð¸ÑÐ¿ÑÐ°ÑÐ¸Ð²ÑÐµ %"
 "d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "ÐÐ´Ð³Ð¾Ð²Ð¾ÑÐ¾Ñ Ð½Ð° %s Ðµ Ð¸ÑÐ¿ÑÐ°ÑÐµÐ½"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "ÐÑÐµÑÐºÐ° Ð¿ÑÐ¸ Ð·Ð°ÑÑÐ²ÑÐ²Ð°ÑÐµÑÐ¾ Ð½Ð° Ð±ÐµÐ»ÐµÑÐºÐ°ÑÐ°."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "ÐÐ°Ð·Ð½Ð°ÑÐµÑÐµ Ð³Ð¾ Ð¸Ð¼ÐµÑÐ¾ Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð½Ð° ÐºÐ¾ÑÑÑÐ¾ ÑÐ°ÐºÐ°ÑÐµ Ð´Ð° ÑÐµ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ¸ÑÐµ"
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð´Ð° ÑÐµ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ°ÑÐµ Ð½Ð° OMB Ð¿ÑÐ¾ÑÐ¸Ð»Ð¸ Ð¿Ð¾ Ð½Ð°ÑÐµÐ´Ð±Ð°."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "ÐÑÐµÑÐ¿Ð»Ð°ÑÐµÐ½Ð¾ Ð½Ð° %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "ÐÐ°Ð·Ð½Ð°ÑÐµÑÐµ Ð³Ð¾ Ð¸Ð¼ÐµÑÐ¾ Ð½Ð° ÐºÐ¾ÑÐ¸ÑÐ½Ð¸ÐºÐ¾Ñ Ð¾Ð´ ÐºÐ¾Ð³Ð¾ Ð¾ÑÐºÐ°Ð¶ÑÐ²Ð°ÑÐµ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ°."
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "ÐÑÐµÑÐ¿Ð»Ð°ÑÐ°ÑÐ° Ð½Ð° %s Ðµ Ð¾ÑÐºÐ°Ð¶Ð°Ð½Ð°"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "ÐÐ°ÑÐµÐ´Ð±Ð°ÑÐ° ÑÃ¨ ÑÑÑÐµ Ð½Ðµ Ðµ Ð¸Ð¼Ð¿Ð»ÐµÐ¼ÐµÐ½ÑÐ¸ÑÐ°Ð½Ð°."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "ÐÐ·Ð²ÐµÑÑÑÐ²Ð°ÑÐµÑÐ¾ Ðµ Ð¸ÑÐºÐ»ÑÑÐµÐ½Ð¾."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° Ð¸ÑÐºÐ»ÑÑÐ°Ð¼ Ð¸Ð·Ð²ÐµÑÑÑÐ²Ð°ÑÐµ."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "ÐÐ·Ð²ÐµÑÑÑÐ²Ð°ÑÐµÑÐ¾ Ðµ Ð²ÐºÐ»ÑÑÐµÐ½Ð¾."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð°Ð¼ Ð´Ð° Ð²ÐºÐ»ÑÑÐ°Ð¼ Ð¸Ð·Ð²ÐµÑÑÑÐ²Ð°ÑÐµ."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "ÐÐ°ÑÐµÐ´Ð±Ð°ÑÐ° Ð·Ð° Ð½Ð°ÑÐ°Ð²Ð° Ðµ Ð¾Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶ÐµÐ½Ð°"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr "ÐÐ²Ð°Ð° Ð²ÑÑÐºÐ° Ð¼Ð¾Ð¶Ðµ Ð´Ð° ÑÐµ ÑÐ¿Ð¾ÑÑÐµÐ±Ð¸ ÑÐ°Ð¼Ð¾ ÐµÐ´Ð½Ð°Ñ, Ð¸ ÑÑÐ°Ðµ ÑÐ°Ð¼Ð¾ 2 Ð¼Ð¸Ð½ÑÑÐ¸: %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "ÐÑÐºÐ°Ð¶Ð°Ð½Ð° Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ° Ð½Ð°  %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "ÐÐµ ÑÑÐµ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐµÐ½Ð¸ Ð½Ð¸ÐºÐ¾Ð¼Ñ."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ÐÐµ Ð½Ð¸ Ð³Ð¾ Ð¸ÑÐ¿ÑÐ°ÑÐ¸Ð²ÑÐµ ÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»."
 msgstr[1] "ÐÐµ Ð½Ð¸ Ð³Ð¾ Ð¸ÑÐ¿ÑÐ°ÑÐ¸Ð²ÑÐµ ÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»."
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "ÐÐ¸ÐºÐ¾Ñ Ð½Ðµ Ðµ Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐµÐ½ Ð½Ð° ÐÐ°Ñ."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "ÐÐ´Ð´Ð°Ð»ÐµÑÐµÐ½Ð° Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ°"
 msgstr[1] "ÐÐ´Ð´Ð°Ð»ÐµÑÐµÐ½Ð° Ð¿ÑÐµÑÐ¿Ð»Ð°ÑÐ°"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "ÐÐµ ÑÐ»ÐµÐ½ÑÐ²Ð°ÑÐµ Ð²Ð¾ Ð½Ð¸ÐµÐ´Ð½Ð° Ð³ÑÑÐ¿Ð°."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ÐÐµ Ð½Ð¸ Ð³Ð¾ Ð¸ÑÐ¿ÑÐ°ÑÐ¸Ð²ÑÐµ ÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»."
 msgstr[1] "ÐÐµ Ð½Ð¸ Ð³Ð¾ Ð¸ÑÐ¿ÑÐ°ÑÐ¸Ð²ÑÐµ ÑÐ¾Ñ Ð¿ÑÐ¾ÑÐ¸Ð»."
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6503,6 +6734,10 @@ msgstr "ÐÐµÐ¼Ð° return-to Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ¸."
 msgid "Repeat this notice?"
 msgstr "ÐÐ° ÑÐ° Ð¿Ð¾Ð²ÑÐ¾ÑÐ°Ð¼ Ð±ÐµÐ»ÐµÑÐºÐ°Ð²Ð°?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "ÐÐ°"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "ÐÐ¾Ð²ÑÐ¾ÑÐ¸ ÑÐ° Ð·Ð°Ð±ÐµÐ»ÐµÑÐºÐ°Ð²Ð°"
@@ -6689,47 +6924,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "ÐÐ¾Ð´ÐµÑÐ°ÑÐ¾Ñ"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "Ð¿ÑÐµÐ´ Ð½ÐµÐºÐ¾Ð»ÐºÑ ÑÐµÐºÑÐ½Ð´Ð¸"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "Ð¿ÑÐµÐ´ ÐµÐ´Ð½Ð° Ð¼Ð¸Ð½ÑÑÐ°"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "Ð¿ÑÐµÐ´ %d Ð¼Ð¸Ð½ÑÑÐ¸"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "Ð¿ÑÐµÐ´ ÐµÐ´ÐµÐ½ ÑÐ°Ñ"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "Ð¿ÑÐµÐ´ %d ÑÐ°ÑÐ°"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "Ð¿ÑÐµÐ´ ÐµÐ´ÐµÐ½ Ð´ÐµÐ½"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "Ð¿ÑÐµÐ´ %d Ð´ÐµÐ½Ð¾Ð²Ð¸"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "Ð¿ÑÐµÐ´ ÐµÐ´ÐµÐ½ Ð¼ÐµÑÐµÑ"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "Ð¿ÑÐµÐ´ %d Ð¼ÐµÑÐµÑÐ°"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "Ð¿ÑÐµÐ´ ÐµÐ´Ð½Ð° Ð³Ð¾Ð´Ð¸Ð½Ð°"
 
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index 149c103e42..8d88760286 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:52+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:25+0000\n"
 "Language-Team: Norwegian (bokmÃ¥l)â¬\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: out-statusnet\n"
@@ -72,8 +72,13 @@ msgstr "Lukket"
 msgid "Save access settings"
 msgstr "Lagre tilgangsinnstillinger"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Lagre"
@@ -104,7 +109,7 @@ msgstr "Ingen slik side"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen slik bruker"
@@ -347,7 +352,7 @@ msgstr "Fant ingen status med den ID-en."
 msgid "This status is already a favorite."
 msgstr "Denne statusen er allerede en favoritt."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Kunne ikke opprette favoritt."
 
@@ -464,7 +469,7 @@ msgstr "Gruppe ikke funnet!"
 msgid "You are already a member of that group."
 msgstr "Du er allerede medlem av den gruppen."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blitt blokkert fra den gruppen av administratoren."
 
@@ -515,17 +520,17 @@ msgid "Invalid token."
 msgstr "Ugyldig symbol."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -556,12 +561,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Uventet skjemainnsending."
 
@@ -819,27 +827,44 @@ msgstr ""
 "lenger abbonere pÃ¥ deg, vil ikke kunne abbonere pÃ¥ deg i fremtiden og du vil "
 "ikke bli varslet om @-svar fra dem."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Nei"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Ikke blokker denne brukeren"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Blokker denne brukeren"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Kunne ikke lagre blokkeringsinformasjon."
 
@@ -852,8 +877,8 @@ msgstr "Kunne ikke lagre blokkeringsinformasjon."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Ingen slik gruppe."
 
@@ -912,16 +937,24 @@ msgstr "Ukjent adressetype %s"
 msgid "That address has already been confirmed."
 msgstr "Den adressen har allerede blitt bekreftet."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Klarte ikke Ã¥ oppdatere bruker."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Kunne ikke slette e-postbekreftelse."
 
@@ -976,11 +1009,13 @@ msgstr ""
 "data om programmet fra databasen, inkludert alle eksisterende "
 "brukertilkoblinger."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Ikke slett dette programmet"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Slett dette programmet"
 
@@ -1015,11 +1050,13 @@ msgstr "Slett notis"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Er du sikker pÃ¥ at du vil slette denne notisen?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Ikke slett denne notisen"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
@@ -1043,7 +1080,8 @@ msgstr ""
 "Er du sikker pÃ¥ at du vil slette denne brukeren? Dette vil slette alle data "
 "om brukeren fra databasen, uten sikkerhetskopi."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Slett denne brukeren"
 
@@ -1155,15 +1193,13 @@ msgid "Reset back to default"
 msgstr "Tilbakestill til standardverdier"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Lagre"
 
@@ -1289,31 +1325,43 @@ msgstr "Kunne ikke opprette alias."
 msgid "Options saved."
 msgstr "Lagret valg."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "E-postinnstillinger"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Velg hvordan du mottar e-post fra %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresse"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-postadresse"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "NÃ¥vÃ¦rende bekreftede e-postadresse"
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Fjern"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1321,106 +1369,141 @@ msgstr ""
 "Venter pÃ¥ bekreftelse av adressen. Sjekk innboksen din (og sÃ¸ppelboksen) for "
 "melding med videre veiledning."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-postadresse"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-postadresse (Â«brukernavn@eksempel.orgÂ»)"
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Legg til"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "innkommende e-post"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Send e-post til denne adressen for Ã¥ poste nye notiser."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Angi en ny e-postadresse for Ã¥ poste til; fjerner den gamle."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Innstillinger"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send meg varsler om nye abonnementer gjennom e-post."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Send meg en e-post nÃ¥r noen legger min notis til som favoritt."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Send meg en e-post nÃ¥r noen sender meg en privat melding."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send meg en e-post nÃ¥r noen sender meg et Â«@-svarÂ»."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillat venner Ã¥ knuffe meg og sende meg en e-post."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Jeg vil poste notiser med e-post."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser en MicroID for min e-postadresse."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "Innstillinger lagret."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Ingen e-postadresse."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Klarer ikke normalisere epostadressen"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ugyldig e-postadresse."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Det er allerede din e-postadresse."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Den e-postadressen tilhÃ¸rer allerede en annen bruker."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Kunne ikke sette inn bekreftelseskode."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1428,43 +1511,56 @@ msgstr ""
 "En bekreftelseskode ble sendt til epostadressen du la til. Sjekk innboksen "
 "din (og sÃ¸ppelboksen) for koden, og hvordan du skal bruke den."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventende bekreftelse Ã¥ avbryte."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Det er feil IM-adresse."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Bekreftelse avbrutt."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Det er ikke din e-postadresse."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Adressen ble fjernet."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Ingen innkommende e-postadresse."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr ""
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Inkommende e-postadresse fjernet."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Ny innkommende e-postadresse lagt til."
 
@@ -1653,15 +1749,17 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Ikke blokker denne brukeren fra denne gruppa"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Blokker denne brukeren fra denne gruppen"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1839,26 +1937,39 @@ msgstr "Bruker er ikke blokkert fra gruppe."
 msgid "Error removing the block."
 msgstr "Feil under oppheving av blokkering."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "Innstillinger for direktemeldinger"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr ""
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Direktemeldingsadresse"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "NÃ¥vÃ¦rende bekreftede Jabber/GTak-adresse."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1867,54 +1978,74 @@ msgstr ""
 "Venter pÃ¥ godkjenning. Sjekk din Jabber/GTalk-konto for en melding med "
 "instruksjoner (la du %s til vennelisten din?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Direktemeldingsadresse"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Innstillinger"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publiser en MicroID for min Jabber/Gtalk-adresse."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Innstillinger lagret."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Ingen Jabber ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Klarer ikke normalisere Jabber-IDen"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Ugyldig Jabber ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Det er allerede din Jabber ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1923,10 +2054,35 @@ msgstr ""
 "En bekreftelseskode ble sendt til lynmeldingsadressen du la til. Du mÃ¥ "
 "godkjenne %s for Ã¥ sende meldinger til deg."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Det er feil IM-adresse."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Kunne ikke slette e-postbekreftelse."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Bekreftelse avbrutt."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Det er ikke din Jabber ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Adressen ble fjernet."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1968,7 +2124,9 @@ msgstr "Inviter nye brukere"
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2082,7 +2240,9 @@ msgstr "Du mÃ¥ vÃ¦re innlogget for Ã¥ bli med i en gruppe."
 msgid "No nickname or ID."
 msgstr "ngen kallenavn eller ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ble med i gruppen %2$s"
@@ -2091,11 +2251,13 @@ msgstr "%1$s ble med i gruppen %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Du mÃ¥ vÃ¦re innlogget for Ã¥ forlate en gruppe."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "Du er ikke et medlem av den gruppen."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s forlot gruppe %2$s"
@@ -2206,12 +2368,12 @@ msgstr "Bruk dette skjemaet for Ã¥ opprette en ny gruppe."
 msgid "New message"
 msgstr "Ny melding"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Du kan ikke sende en melding til denne brukeren."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Inget innhold."
 
@@ -2219,7 +2381,7 @@ msgstr "Inget innhold."
 msgid "No recipient specified."
 msgstr "Ingen mottaker oppgitt."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2472,7 +2634,7 @@ msgid "6 or more characters"
 msgstr "6 eller flere tegn"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Bekreft"
 
@@ -3832,66 +3994,107 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Innstillinger for IM"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "SMS-innstillinger"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan motta SMS-meldinger gjennom e-post fra %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "SMS er ikke tilgjengelig."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Direktemeldingsadresse"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "NÃ¥vÃ¦rende bekreftede telefonnummer med mulighet for Ã¥ motta SMS."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Venter pÃ¥ bekreftelse for dette telefonnummeret."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Bekreftelseskode"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Skriv inn koden du mottok pÃ¥ telefonen din."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Bekreft"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "Telefonnummer for SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Innstillinger"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Innstillinger lagret."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Ingen telefonnummer."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Ingen operatÃ¸r valgt."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Det er allerede din ditt telefonnummer."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -3900,30 +4103,50 @@ msgstr ""
 "En bekreftelseskode ble sendt til telefonnummeret du la til. Sjekk innboksen "
 "din for koden, og hvordan du skal bruke den."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Bekreftelse avbrutt."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Det er ikke ditt telefonnummer."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Telefonnummer for SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "MobiloperatÃ¸r"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Velg en operatÃ¸r"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr ""
 
@@ -5086,10 +5309,8 @@ msgstr ""
 "Standardtilgang for dette programmet: skrivebeskyttet eller lese- og "
 "skrivetilgang"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -5165,34 +5386,40 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr "Notis med den id'en finnes ikke"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "Bruker har ingen siste notis"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Fant ingen bruker med kallenavn %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Fant ingen bruker med kallenavn %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Det gir ikke sÃ¥ mye mening Ã¥ knuffe seg selv."
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Knuff sendt til %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5203,198 +5430,202 @@ msgstr ""
 "Abonnenter: %2$s\n"
 "Notiser: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Notis markert som favoritt."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Du er allerede medlem av den gruppen."
 
-#: lib/command.php:331
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Klarte ikke Ã¥ oppdatere bruker."
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s ble med i gruppen %s"
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "Kunne ikke fjerne brukeren %s fra gruppen %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s forlot gruppen %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt navn: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Posisjon: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hjemmeside: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Melding for lang - maks er %d tegn, du sendte %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Direktemelding til %s sendt"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Feil ved sending av direktemelding."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "Kan ikke repetere din egen notis"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "Allerede repetert den notisen"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Notis fra %s repetert"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Feil ved repetering av notis."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Notis for lang - maks er %d tegn, du sendte %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Svar til %s sendt"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Feil ved lagring av notis."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "Svar til %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Ikke autorisert."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ikke autorisert."
 msgstr[1] "Ikke autorisert."
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Svar til %s"
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Svar til %s"
 msgstr[1] "Svar til %s"
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Du er allerede logget inn!"
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er allerede logget inn!"
 msgstr[1] "Du er allerede logget inn!"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6296,6 +6527,10 @@ msgstr ""
 msgid "Repeat this notice?"
 msgstr "Repeter denne notisen?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ja"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repeter denne notisen"
@@ -6487,47 +6722,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "noen fÃ¥ sekunder siden"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "omtrent ett minutt siden"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "omtrent %d minutter siden"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "omtrent Ã©n time siden"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "omtrent %d timer siden"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "omtrent Ã©n dag siden"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "omtrent %d dager siden"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "omtrent Ã©n mÃ¥ned siden"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "omtrent %d mÃ¥neder siden"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "omtrent ett Ã¥r siden"
 
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index f1842a8746..b88ce26d6f 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:01+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:31+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: out-statusnet\n"
@@ -73,8 +73,13 @@ msgstr "Gesloten"
 msgid "Save access settings"
 msgstr "Toegangsinstellingen opslaan"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Opslaan"
@@ -104,7 +109,7 @@ msgstr "Deze pagina bestaat niet."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
@@ -348,7 +353,7 @@ msgstr "Er is geen status gevonden met dit ID."
 msgid "This status is already a favorite."
 msgstr "Deze mededeling staat al in uw favorietenlijst."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Het was niet mogelijk een favoriet aan te maken."
 
@@ -470,7 +475,7 @@ msgstr "De groep is niet aangetroffen."
 msgid "You are already a member of that group."
 msgstr "U bent al lid van die groep."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
 
@@ -521,17 +526,17 @@ msgid "Invalid token."
 msgstr "Ongeldig token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -570,12 +575,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "Het verzoektoken %s is geweigerd en ingetrokken."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Het formulier is onverwacht ingezonden."
 
@@ -837,27 +845,44 @@ msgstr ""
 "niet meer volgen en u wordt niet op de hoogte gebracht van \"@\"-antwoorden "
 "van deze gebruiker."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Nee"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Gebruiker niet blokkeren"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Deze gebruiker blokkeren"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
 
@@ -870,8 +895,8 @@ msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "De opgegeven groep bestaat niet."
 
@@ -930,16 +955,24 @@ msgstr "Onbekend adrestype %s."
 msgid "That address has already been confirmed."
 msgstr "Dit adres is al bevestigd."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "De gebruiker kon gebruiker niet bijwerkt worden."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "De e-mailbevestiging kon niet verwijderd worden."
 
@@ -994,11 +1027,13 @@ msgstr ""
 "worden alle gegevens van deze applicatie uit de database verwijderd, "
 "inclusief alle bestaande gebruikersverbindingen."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Deze applicatie niet verwijderen"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Deze applicatie verwijderen"
 
@@ -1033,11 +1068,13 @@ msgstr "Mededeling verwijderen"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Weet u zeker dat u deze aankondiging wilt verwijderen?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Deze mededeling niet verwijderen"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Deze mededeling verwijderen"
 
@@ -1062,7 +1099,8 @@ msgstr ""
 "worden alle gegevens van deze gebruiker uit de database verwijderd. Het is "
 "niet mogelijk ze terug te zetten."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Gebruiker verwijderen"
 
@@ -1175,15 +1213,13 @@ msgid "Reset back to default"
 msgstr "Standaardinstellingen toepassen"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Opslaan"
 
@@ -1309,31 +1345,43 @@ msgstr "Het was niet mogelijk de aliassen aan te maken."
 msgid "Options saved."
 msgstr "De instellingen zijn opgeslagen."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "E-mailvoorkeuren"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Uw e-mailinstellingen op %%site.name%% beheren."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adres"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-mailadres"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Huidige bevestigde e-mailadres"
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Verwijderen"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1341,108 +1389,142 @@ msgstr ""
 "Er wordt gewacht op bevestiging van dit adres. Controleer uw inbox (en uw "
 "ongewenste berichten/spam) voor een bericht met nadere instructies."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-mailadres"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-mailadres, zoals \"gebruikersnaam@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Toevoegen"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Inkomende e-mail"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Stuur een email naar dit adres om een nieuw bericht te posten"
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Stelt een nieuw e-mailadres in voor het ontvangen van berichten. Het "
 "bestaande e-mailadres wordt verwijderd."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Nieuw"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Voorkeuren"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Mij e-mailen bij nieuwe abonnementen."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Mij e-mailen als iemand mijn mededeling als favoriet instelt."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Mij e-mailen als iemand mij een privÃ©bericht zendt."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Mij e-mailen als iemand mij een antwoord met \"@\" erin stuurt."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Vrienden mogen me porren en e-mailen."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Ik wil mededelingen per e-mail plaatsen."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Een MicroID voor mijn e-mailadres publiceren."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Uw voorkeuren zijn opgeslagen."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "De ontwerpvoorkeuren zijn opgeslagen."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Geen e-mailadres"
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Kan het emailadres niet normaliseren"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Geen geldig e-mailadres."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "U hebt dit e-mailadres als ingesteld als uw e-mailadres."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Dit e-mailadres is al geregistreerd door een andere gebruiker."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "De bevestigingscode kon niet ingevoegd worden."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1451,43 +1533,56 @@ msgstr ""
 "toegevoegd. Controleer uw inbox (en spam box!) Voor de code en instructies "
 "hoe het te gebruiken."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Er is geen openstaand bevestigingsverzoek om te annuleren."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Dat is het verkeerde IM-adres."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Bevestiging geannuleerd."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Dit is niet uw e-mailadres."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Het adres is verwijderd."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Geen binnenkomend e-mailadres"
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Kan de gebruikersgegevens niet vernieuwen"
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Het e-mailadres voor inkomende mail is verwijderd."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Het nieuwe binnenkomende e-mailadres is toegevoegd."
 
@@ -1683,15 +1778,17 @@ msgstr ""
 "gebruiker wordt dan uit de groep verwijderd, kan er geen berichten meer "
 "plaatsen en kan zich in de toekomst ook niet meer op de groep abonneren."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Deze gebruiker niet de toegang tot deze groep ontzeggen"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Deze gebruiker de toegang tot deze groep ontzeggen"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 "Er is een databasefout opgetreden bij het uitsluiten van de gebruiker van de "
@@ -1878,11 +1975,15 @@ msgstr "De gebruiker is niet de toegang tot de groep ontzegd."
 msgid "Error removing the block."
 msgstr "Er is een fout opgetreden bij het verwijderen van de blokkade."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "IM-instellingen"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1891,15 +1992,24 @@ msgstr ""
 "U kunt berichten verzenden en ontvangen via Jabber/GTalk [\"onmiddellijke "
 "berichten\"](%%doc.im%%). Maak hieronder uw instellingen."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "IM is niet beschikbaar."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM-adres"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Huidige bevestigde Jabber/GTalk adres."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1909,11 +2019,9 @@ msgstr ""
 "gebruiker op een bericht met nadere instructies. Hebt u %s aan uw "
 "contactenlijst toegevoegd?"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM-adres"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1922,45 +2030,67 @@ msgstr ""
 "Jabber-ID of GTalk-adres, zoals \"gebruiker@example.org\". Zorg ervoor dat u "
 "%s eerst aan uw contactenlijst in uw IM-programma of in GTalk toevoegt."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Voorkeuren"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Mij berichten sturen via Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Een mededeling versturen als mijn Jabber/GTalk-status wijzigt."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Mij antwoorden sturen via Jabber/GTalk van gebruikers op wie ik niet "
 "geabonneerd ben."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Een MicroID voor mijn Jabber/GTalk-adres publiceren."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Uw voorkeuren zijn opgeslagen."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Geen Jabber-ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Het was niet mogelijk om het Jabber-ID te normaliseren"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Geen geldige Jabber-ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "U hebt dit al ingesteld als uw Jabber-ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Het Jabber-ID wordt al gebruikt door een andere gebruiker."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1969,10 +2099,35 @@ msgstr ""
 "Er is een bevestigingscode verstuurd naar het opgegeven IM-adres. U moet "
 "ermee akkoord gaan dat %s berichten aan u verzendt."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Dat is het verkeerde IM-adres."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "De e-mailbevestiging kon niet verwijderd worden."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Bevestiging geannuleerd."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Dit is niet uw Jabber-ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Het adres is verwijderd."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2015,7 +2170,9 @@ msgstr "Nieuwe gebruikers uitnodigen"
 msgid "You are already subscribed to these users:"
 msgstr "U bent als geabonneerd op deze gebruikers:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2141,7 +2298,9 @@ msgstr "U moet aangemeld zijn om lid te worden van een groep."
 msgid "No nickname or ID."
 msgstr "Geen gebruikersnaam of ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s is lid geworden van de groep %2$s"
@@ -2150,11 +2309,13 @@ msgstr "%1$s is lid geworden van de groep %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "U moet aangemeld zijn om een groep te kunnen verlaten."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "U bent geen lid van deze groep"
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s heeft de groep %2$s verlaten"
@@ -2265,12 +2426,12 @@ msgstr "Gebruik dit formulier om een nieuwe groep aan te maken."
 msgid "New message"
 msgstr "Nieuw bericht"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "U kunt geen bericht naar deze gebruiker zenden."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Geen inhoud!"
 
@@ -2278,7 +2439,7 @@ msgstr "Geen inhoud!"
 msgid "No recipient specified."
 msgstr "Er is geen ontvanger aangegeven."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
@@ -2541,7 +2702,7 @@ msgid "6 or more characters"
 msgstr "Zes of meer tekens"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Bevestigen"
 
@@ -3951,44 +4112,74 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Websitebrede mededeling opslaan"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "SMS-instellingen"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "U kunt SMS-berichten per e-mail ontvangen van %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "SMS is niet beschikbaar."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM-adres"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Huidige bevestigde telefoonnummer met SMS-functie."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Er wordt gewacht op bevestiging van dit telefoonnummer."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Bevestigingscode"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Voer de code in die u via uw telefoon hebt ontvangen."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Bevestigen"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "SMS-nummer"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefoonnummer zonder spaties of leestekens, met netnummer"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Voorkeuren"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3996,23 +4187,34 @@ msgstr ""
 "Mij mededelingen via SMS sturen. Ik begrijp dat dit exorbitante rekeningen "
 "van mijn provider kan opleveren."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Uw voorkeuren zijn opgeslagen."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Geen telefoonnummer."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Er is geen provider geselecteerd."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "U hebt dit al ingesteld als uw telefoonnummer."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Dit telefoonnummer is al geregistrerd door een andere gebruiker."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -4020,23 +4222,42 @@ msgstr ""
 "Er is een bevestigingscode verzonden naar het telefoonnummer dat u hebt "
 "toegevoegd. Op uw telefoon vindt u de code en de instructies."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Dit is het verkeerde bevestigingsnummer."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Bevestiging geannuleerd."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Dit is niet uw telefoonnummer."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS-nummer"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Mobiele aanbieder"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Selecteer een provider"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4046,7 +4267,8 @@ msgstr ""
 "SMS ondersteunt, maar nog niet in de lijst is opgenomen, laat dit ons dan "
 "via e-mail weten op het e-mailadres %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Er is geen code ingevoerd"
 
@@ -4073,7 +4295,6 @@ msgid "Invalid snapshot report URL."
 msgstr "De rapportage-URL voor snapshots is ongeldig."
 
 #: actions/snapshotadminpanel.php:200
-#, fuzzy
 msgid "Randomly during web hit"
 msgstr "Willekeurig tijdens een websitehit"
 
@@ -4668,7 +4889,7 @@ msgstr "Het was niet mogelijk het bericht bij te werken met de nieuwe URI."
 
 #. TRANS: Server exception. %s are the error details.
 #: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
 
@@ -5262,34 +5483,29 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Standaardtoegang voor deze applicatie: alleen-lezen of lezen en schrijven"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Annuleren"
 
 #. TRANS: Application access type
 #: lib/applicationlist.php:136
-#, fuzzy
 msgid "read-write"
-msgstr "Lezen en schrijven"
+msgstr "lezen en schrijven"
 
 #. TRANS: Application access type
 #: lib/applicationlist.php:138
-#, fuzzy
 msgid "read-only"
-msgstr "Alleen-lezen"
+msgstr "alleen-lezen"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
 #: lib/applicationlist.php:144
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "Goedgekeurd op %1$s met toegang \"%2$s\"."
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Intrekken"
@@ -5341,34 +5557,40 @@ msgstr "Het uitvoeren van het commando is mislukt"
 msgid "Notice with that id does not exist"
 msgstr "Er bestaat geen mededeling met dat ID"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "Deze gebruiker heeft geen laatste mededeling"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "De gebruiker %s is niet aangetroffen"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "De lokale gebruiker %s is niet aangetroffen"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Dit commando is nog niet geÃ¯mplementeerd."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Het heeft niet zoveel zin om uzelf te porren..."
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "De por naar %s is verzonden"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5379,57 +5601,55 @@ msgstr ""
 "Abonnees: %2$s\n"
 "Mededelingen: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "De mededeling is op de favorietenlijst geplaatst."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "U bent al lid van deze groep"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Het was niet mogelijk om de gebruiker %s toe te voegen aan de groep %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s is lid geworden van de groep %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "De gebruiker %s kon niet uit de groep %s verwijderd worden"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s heeft de groep %s verlaten"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Volledige naam: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Locatie: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Thuispagina: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Over: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5438,145 +5658,151 @@ msgstr ""
 "%s is een profiel op afstand. U kunt alle privÃ©berichten verzenden aan "
 "gebruikers op dezelfde server."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
-"Het bericht te is lang. De maximale lengte is %d tekens. De lengte van uw "
-"bericht was %d"
+"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw "
+"bericht was %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Het directe bericht aan %s is verzonden"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "U kunt uw eigen mededelingen niet herhalen."
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "U hebt die mededeling al herhaald."
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "De mededeling van %s is herhaald"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Er is een fout opgetreden bij het herhalen van de mededeling."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 "De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling "
 "bevatte %d tekens"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Het antwoord aan %s is verzonden"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren"
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Abonneren op OMB-profielen op commando is niet mogelijk."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Geabonneerd op %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 "Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Uw abonnement op %s is opgezegd"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Dit commando is nog niet geÃ¯mplementeerd."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Notificaties uitgeschakeld."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Notificaties ingeschakeld."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Het is niet mogelijk de notificatie uit te schakelen."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "Het aanmeldcommando is uitgeschakeld"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 "Deze verwijzing kan slechts Ã©Ã©n keer gebruikt worden en is twee minuten "
 "geldig: %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "Het abonnement van %s is opgeheven"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "U bent op geen enkele gebruiker geabonneerd."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "U bent geabonneerd op deze gebruiker:"
 msgstr[1] "U bent geabonneerd op deze gebruikers:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "Niemand heeft een abonnenment op u."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Deze gebruiker is op u geabonneerd:"
 msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "U bent lid van geen enkele groep."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "U bent lid van deze groep:"
 msgstr[1] "U bent lid van deze groepen:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6555,6 +6781,10 @@ msgstr "Er zijn geen \"terug naar\"-parameters opgegeven."
 msgid "Repeat this notice?"
 msgstr "Deze mededeling herhalen?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ja"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Deze mededeling herhalen"
@@ -6741,47 +6971,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "een paar seconden geleden"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "ongeveer een minuut geleden"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "ongeveer %d minuten geleden"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "ongeveer een uur geleden"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "ongeveer %d uur geleden"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "ongeveer een dag geleden"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "ongeveer %d dagen geleden"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "ongeveer een maand geleden"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "ongeveer %d maanden geleden"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index bf802b96f7..00534aea67 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:36:57+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:28+0000\n"
 "Language-Team: Norwegian Nynorsk\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: out-statusnet\n"
@@ -78,8 +78,13 @@ msgstr "BlokkÃ©r"
 msgid "Save access settings"
 msgstr "Avatar-innstillingar"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -111,7 +116,7 @@ msgstr "Dette emneord finst ikkje."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brukaren finst ikkje."
@@ -348,7 +353,7 @@ msgstr "Fann ingen status med den ID-en."
 msgid "This status is already a favorite."
 msgstr "Denne notisen er alt ein favoritt!"
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Kunne ikkje lagre favoritt."
 
@@ -471,7 +476,7 @@ msgstr "Fann ikkje API-metode."
 msgid "You are already a member of that group."
 msgstr "Du er allereie medlem av den gruppa"
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -524,17 +529,17 @@ msgid "Invalid token."
 msgstr "Ugyldig storleik."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -568,12 +573,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Uventa skjemasending."
 
@@ -835,28 +843,45 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Nei"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 #, fuzzy
 msgid "Do not block this user"
 msgstr "LÃ¥s opp brukaren"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Jau"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "BlokkÃ©r denne brukaren"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Lagring av informasjon feila."
 
@@ -869,8 +894,8 @@ msgstr "Lagring av informasjon feila."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Denne gruppa finst ikkje."
 
@@ -931,16 +956,24 @@ msgstr "Ukjend adressetype %s"
 msgid "That address has already been confirmed."
 msgstr "Den addressa har alt blitt bekrefta."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Kan ikkje oppdatera brukar."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
@@ -998,12 +1031,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "Kan ikkje sletta notisen."
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "Slett denne notisen"
@@ -1040,12 +1075,14 @@ msgstr "Slett notis"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Sikker pÃ¥ at du vil sletta notisen?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "Kan ikkje sletta notisen."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
@@ -1070,7 +1107,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 #, fuzzy
 msgid "Delete this user"
 msgstr "Slett denne notisen"
@@ -1192,15 +1230,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Lagra"
 
@@ -1339,32 +1375,45 @@ msgstr "Kunne ikkje lagre favoritt."
 msgid "Options saved."
 msgstr "Lagra innstillingar."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "Epostinnstillingar"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Styr korleis du fÃ¥r epost frÃ¥ %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adresse"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Epostadresser"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Godkjent epostadresse."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Fjern"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1372,109 +1421,143 @@ msgstr ""
 "Ventar pÃ¥ godkjenning. Sjekk innboksen (og sÃ¸ppelpostboksen) for ei melding "
 "med instruksjonar."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Epostadresser"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Epostadresse (Â«brukarnamn@example.orgÂ»)"
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Legg til"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Innkomande epost"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Send epost til denne addressa for Ã¥ legge til nye notisar."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Vel ny epostadresse til Ã¥ oppdatera med; fjerner den gamle."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Brukarval"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Send meg ein notis ved nye tingingar pÃ¥ epost."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Send meg ein epost nÃ¥r nokon legg til ein av mine notisar som favoritt."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Send meg ein epost nÃ¥r nokon sender meg ei privat melding."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Send meg ein epost nÃ¥r nokon sender meg ei privat melding."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillat vennar Ã¥ sende meg ein epost."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Eg vil senda notisar med epost."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publiser ein MicroID for epost addressa mi."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Lagra brukarval."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Synkroniserings innstillingar blei lagra."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Ingen epostadresse."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Klarar ikkje normalisera epostadressa"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ikkje ei gyldig epostadresse."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Det er alt din epost addresse"
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Den epost addressa er alt registrert hos ein annan brukar."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Kan ikkje leggja til godkjenningskode."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1482,43 +1565,56 @@ msgstr ""
 "Sendte godkjenningskode til epostadressa du la til. Sjekk innboksen (og "
 "sÃ¸ppelpostboksen) for koden og veiledning pÃ¥ korleis du nyttar han."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventande stadfesting Ã¥ avbryta."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Det er feil lynmeldings addresse."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Stadfesting avbrutt."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Det er ikkje din epost addresse."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Addressa blei fjerna."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Ingen innkomande epostadresse."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Kan ikkje oppdatera brukarinformajon."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Fjerna innkomande epostadresse."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "La til ny innkomande epostadresse."
 
@@ -1718,17 +1814,19 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 #, fuzzy
 msgid "Do not block this user from this group"
 msgstr "Ei liste over brukarane i denne gruppa."
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 #, fuzzy
 msgid "Block this user from this group"
 msgstr "Ei liste over brukarane i denne gruppa."
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1908,12 +2006,16 @@ msgstr "Brukar har blokkert deg."
 msgid "Error removing the block."
 msgstr "Feil ved fjerning av blokka."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "Ljonmeldinginnstillingar"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1922,16 +2024,26 @@ msgstr ""
 "Du kan sende og motta meldingar gjennom Jabber/GTalk [direktemeldingar](%%"
 "doc.im%%).  Set opp adressa og innstillingar under."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 #, fuzzy
 msgid "IM is not available."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "Ljonmeldingadresse"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Stadfesta Jabber/Gtalk-adresse."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1940,12 +2052,9 @@ msgstr ""
 "Venter pÃ¥ godkjenning. Sjekk din Jabber/GTalk-konto for ei melding med "
 "instruksjonar (la du %s til venelista di?)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "Ljonmeldingadresse"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1954,43 +2063,65 @@ msgstr ""
 "Jabber- eller GTalk-adresse, dÃ¸me Â«brukarnamn@example.orgÂ». Hugs Ã¥ fyrst "
 "leggja %s til venelista di i ljonmeldingsklienten din."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Brukarval"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Send meg ein notis via Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Legg til ein notis nÃ¥r min Jabber/GTalk status forandrar seg."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "Send meg svar via Jabber/GTalk fra folk eg ikkje abbonnerar pÃ¥."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publiser ein MicroID for Jabber/GTalk addressene mine"
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Lagra brukarval."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Nei Jabber-ID"
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Klarar ikkje normalisera Jabber-IDen"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Ikkje ein gyldig Jabber-ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Det er alt din Jabber ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-ID tilhÃ¸yrer allereie ein annan brukar."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1999,10 +2130,35 @@ msgstr ""
 "Sendte godkjenningskode til ljonmeldingsadressa du la til. Du mÃ¥ godtaka %s "
 "for Ã¥ senda meldinger til deg."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Det er feil lynmeldings addresse."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Kan ikkje sletta e-postgodkjenning."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Stadfesting avbrutt."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Det er ikkje din Jabber ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Addressa blei fjerna."
+
 #: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2043,7 +2199,9 @@ msgstr "InvitÃ©r nye brukarar"
 msgid "You are already subscribed to these users:"
 msgstr "Du tingar allereie oppdatering frÃ¥ desse brukarane:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2164,7 +2322,9 @@ msgstr "Du mÃ¥ vÃ¦re logga inn for Ã¥ bli med i ei gruppe."
 msgid "No nickname or ID."
 msgstr "Ingen kallenamn."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, fuzzy, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%s blei medlem av gruppe %s"
@@ -2173,11 +2333,13 @@ msgstr "%s blei medlem av gruppe %s"
 msgid "You must be logged in to leave a group."
 msgstr "Du mÃ¥ vÃ¦re innlogga for Ã¥ melde deg ut av ei gruppe."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "Du er ikkje medlem av den gruppa."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%s forlot %s gruppa"
@@ -2293,12 +2455,12 @@ msgstr "Bruk dette skjemaet for Ã¥ lage ein ny gruppe."
 msgid "New message"
 msgstr "Ny melding"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Du kan ikkje sende melding til denne brukaren."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Ingen innhald."
 
@@ -2306,7 +2468,7 @@ msgstr "Ingen innhald."
 msgid "No recipient specified."
 msgstr "Ingen mottakar spesifisert."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2571,7 +2733,7 @@ msgid "6 or more characters"
 msgstr "6 eller fleire teikn"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Godta"
 
@@ -3959,47 +4121,77 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Statusmelding"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "SMS innstillingar"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan motta SMS-meldingar gjennom e-post frÃ¥ %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Denne sida er ikkje tilgjengleg i eit"
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Ljonmeldingadresse"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Godkjent mobiltelefonnummer."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Ventar pÃ¥ godkjenning for dette telefonnummeret."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Stadfestingskode"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Skriv inn koden du fekk pÃ¥ telefonen."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Godta"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 #, fuzzy
 msgid "SMS phone number"
 msgstr "SMS telefon nummer"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonnummer, kun tall, med landskode"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Brukarval"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -4007,23 +4199,34 @@ msgstr ""
 "Send meg ein notis via SMS; eg forstÃ¥r at dette kan fÃ¸re til kostnadar fra "
 "min tilbydar."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Lagra brukarval."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Ingen telefonnummer."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Ingen mobiloperatÃ¸r vald."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Det er alt ditt telefonnummer"
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Det telefonnummeret er alt registrert hos ein annan brukar."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -4032,23 +4235,42 @@ msgstr ""
 "Sende godkjenningskode til telefonnummeret du la til. Sjekk innboksen for "
 "koden og veiledning pÃ¥ korleis du nyttar han."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Det er feil godkjennings nummer."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Stadfesting avbrutt."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Det er ikkje ditt telefonnummer"
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS telefon nummer"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Telefontilbydar"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Velg ein tilbydar"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4057,7 +4279,8 @@ msgstr ""
 "MobiloperatÃ¸ren din. Ta kontakt pÃ¥ %s viss du kjenner ein mobiloperatÃ¸r som "
 "aksepterer SMS-over-epost, men ikkje vistast her."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Ingen innskriven kode"
 
@@ -5294,10 +5517,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -5375,34 +5596,40 @@ msgstr "Kommandoen feila"
 msgid "Notice with that id does not exist"
 msgstr "Fann ingen profil med den IDen."
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "Brukaren har ikkje siste notis"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Orsak, men kommandoen er ikkje laga enno."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "Dytta!"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5410,203 +5637,207 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Notis markert som favoritt."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Du er allereie medlem av den gruppa"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
 msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s"
 
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s blei medlem av gruppe %s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "Kunne ikkje fjerne %s fra %s gruppa "
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s forlot %s gruppa"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt namn: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Stad: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Heimeside: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Direkte melding til %s sendt"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Ein feil oppstod ved sending av direkte melding."
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "Kan ikkje slÃ¥ pÃ¥ notifikasjon."
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "Slett denne notisen"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "Melding lagra"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "Eit problem oppstod ved lagring av notis."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Svar pÃ¥ denne notisen"
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Eit problem oppstod ved lagring av notis."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Spesifer namnet til brukaren du vil tinge"
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Tingar %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Spesifer namnet til brukar du vil fjerne tinging pÃ¥"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Tingar ikkje %s lengre"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Kommando ikkje implementert."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Notifikasjon av."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "Kan ikkje skru av notifikasjon."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Notifikasjon pÃ¥."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Kan ikkje slÃ¥ pÃ¥ notifikasjon."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "Tingar ikkje %s lengre"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du tingar allereie oppdatering frÃ¥ desse brukarane:"
 msgstr[1] "Du tingar allereie oppdatering frÃ¥ desse brukarane:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Kan ikkje tinga andre til deg."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Kan ikkje tinga andre til deg."
 msgstr[1] "Kan ikkje tinga andre til deg."
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Du er ikkje medlem av den gruppa."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er ikkje medlem av den gruppa."
 msgstr[1] "Du er ikkje medlem av den gruppa."
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6464,6 +6695,10 @@ msgstr "Manglar argumentet ID."
 msgid "Repeat this notice?"
 msgstr "Svar pÃ¥ denne notisen"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Jau"
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6663,47 +6898,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "eit par sekund sidan"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "omtrent eitt minutt sidan"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "~%d minutt sidan"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "omtrent ein time sidan"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "~%d timar sidan"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "omtrent ein dag sidan"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "~%d dagar sidan"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "omtrent ein mÃ¥nad sidan"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "~%d mÃ¥nadar sidan"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "omtrent eitt Ã¥r sidan"
 
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 380bb740fe..b4a417360b 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:04+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:34+0000\n"
 "Last-Translator: Piotr DrÄg <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: out-statusnet\n"
@@ -77,8 +77,13 @@ msgstr "ZamkniÄte"
 msgid "Save access settings"
 msgstr "Zapisz ustawienia dostÄpu"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Zapisz"
@@ -108,7 +113,7 @@ msgstr "Nie ma takiej strony."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brak takiego uÅ¼ytkownika."
@@ -351,7 +356,7 @@ msgstr "Nie odnaleziono stanÃ³w z tym identyfikatorem."
 msgid "This status is already a favorite."
 msgstr "Ten stan jest juÅ¼ ulubiony."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Nie moÅ¼na utworzyÄ ulubionego wpisu."
 
@@ -468,7 +473,7 @@ msgstr "Nie odnaleziono grupy."
 msgid "You are already a member of that group."
 msgstr "JesteÅ juÅ¼ czÅonkiem tej grupy."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "ZostaÅeÅ zablokowany w tej grupie przez administratora."
 
@@ -519,17 +524,17 @@ msgid "Invalid token."
 msgstr "NieprawidÅowy token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -561,12 +566,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "Token Å¼Ädania %s zostaÅ odrzucony lub uniewaÅ¼niony."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Nieoczekiwane wysÅanie formularza."
 
@@ -824,27 +832,44 @@ msgstr ""
 "do ciebie zostanie usuniÄta, nie bÄdzie mÃ³gÅ ciÄ subskrybowaÄ w przyszÅoÅci "
 "i nie bÄdziesz powiadamiany o Å¼adnych odpowiedziach @ od niego."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Nie"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Nie blokuj tego uÅ¼ytkownika"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Tak"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Zablokuj tego uÅ¼ytkownika"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Zapisanie informacji o blokadzie nie powiodÅo siÄ."
 
@@ -857,8 +882,8 @@ msgstr "Zapisanie informacji o blokadzie nie powiodÅo siÄ."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Nie ma takiej grupy."
 
@@ -917,16 +942,24 @@ msgstr "Nierozpoznany typ adresu %s."
 msgid "That address has already been confirmed."
 msgstr "Ten adres zostaÅ juÅ¼ potwierdzony."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Nie moÅ¼na zaktualizowaÄ uÅ¼ytkownika."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Nie moÅ¼na usunÄÄ potwierdzenia adresu e-mail."
 
@@ -980,11 +1013,13 @@ msgstr ""
 "Na pewno usunÄÄ tÄ aplikacjÄ? WyczyÅci to wszystkie dane o aplikacji z bazy "
 "danych, w tym wszystkie istniejÄce poÅÄczenia uÅ¼ytkownikÃ³w."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Nie usuwaj tej aplikacji"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "UsuÅ tÄ aplikacjÄ"
 
@@ -1019,11 +1054,13 @@ msgstr "UsuÅ wpis"
 msgid "Are you sure you want to delete this notice?"
 msgstr "JesteÅ pewien, Å¼e chcesz usunÄÄ ten wpis?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Nie usuwaj tego wpisu"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "UsuÅ ten wpis"
 
@@ -1047,7 +1084,8 @@ msgstr ""
 "Na pewno usunÄÄ tego uÅ¼ytkownika? WyczyÅci to wszystkie dane o uÅ¼ytkowniku z "
 "bazy danych, bez utworzenia kopii zapasowej."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "UsuÅ tego uÅ¼ytkownika"
 
@@ -1158,15 +1196,13 @@ msgid "Reset back to default"
 msgstr "PrzywrÃ³Ä domyÅlne ustawienia"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Zapisz"
 
@@ -1292,31 +1328,43 @@ msgstr "Nie moÅ¼na utworzyÄ aliasÃ³w."
 msgid "Options saved."
 msgstr "Zapisano opcje."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "Ustawienia adresu e-mail"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "ZarzÄdzanie, jak otrzymywaÄ wiadomoÅci e-mail od %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adres"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "Adres e-mail"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Obecnie potwierdzone adresy e-mail."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "UsuÅ"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1325,106 +1373,141 @@ msgstr ""
 "(takÅ¼e w wiadomoÅciach niechcianych), czy otrzymaÅeÅ wiadomoÅÄ z dalszymi "
 "instrukcjami."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "Adres e-mail"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Adres e-mail, taki jak \"NazwaUÅ¼ytkownika@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Dodaj"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "WiadomoÅci przychodzÄce"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "WyÅlij wiadomoÅÄ e-mail na ten adres, aby wysyÅaÄ nowe wpisy."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "UÅ¼ywaj nowego adresu e-mail do wysyÅania; anuluj poprzedni."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Nowe"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Preferencje"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "WyÅlij wpisy nowych subskrypcji przez e-mail."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "WyÅlij wiadomoÅÄ e-mail, kiedy ktoÅ doda mÃ³j wpis jako ulubiony."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "WyÅlij wiadomoÅÄ e-mail, kiedy ktoÅ wyÅle prywatnÄ wiadomoÅÄ."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "WyÅlij wiadomoÅÄ e-mail, kiedy ktoÅ wyÅle odpowiedÅº \"@\"."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "PozwÃ³l przyjacioÅom na szturchanie mnie i wyÅlij mi wiadomoÅÄ e-mail."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "ChcÄ wysyÅaÄ wpisy przez wiadomoÅci e-mail."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Opublikuj MicroID adresu e-mail."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "Zapisano preferencje."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "Zapisano preferencje wyglÄdu."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Brak adresu e-mail."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Nie moÅ¼na znormalizowaÄ tego adresu e-mail"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "To nie jest prawidÅowy adres e-mail."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Ten adres e-mail jest juÅ¼ twÃ³j."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Ten adres e-mail naleÅ¼y juÅ¼ do innego uÅ¼ytkownika."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Nie moÅ¼na wprowadziÄ kodu potwierdzajÄcego."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1433,43 +1516,56 @@ msgstr ""
 "skrzynce odbiorczej (takÅ¼e w wiadomoÅciach niechcianych), czy otrzymaÅeÅ kod "
 "i instrukcje dotyczÄce jego uÅ¼ycia."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Brak oczekujÄcych potwierdzeÅ do anulowania."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "To jest bÅÄdny adres komunikatora."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Anulowano potwierdzenie."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "To nie jest twÃ³j adres e-mail."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Adres zostaÅ usuniÄty."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Brak przychodzÄcego adresu e-mail."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Nie moÅ¼na zaktualizowaÄ wpisu uÅ¼ytkownika."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "UsuniÄto przychodzÄcy adres e-mail."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Dodano nowy przychodzÄcy adres e-mail."
 
@@ -1660,15 +1756,17 @@ msgstr ""
 "Zostanie usuniÄty z grupy, nie bÄdzie mÃ³gÅ wysyÅaÄ wpisÃ³w i subskrybowaÄ "
 "grupy w przyszÅoÅci."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Nie blokuj tego uÅ¼ytkownika w tej grupie"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Zablokuj tego uÅ¼ytkownika w tej grupie"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "BÅÄd bazy danych podczas blokowania uÅ¼ytkownika w grupie."
 
@@ -1847,11 +1945,15 @@ msgstr "UÅ¼ytkownik nie zostaÅ zablokowany w grupie."
 msgid "Error removing the block."
 msgstr "BÅÄd podczas usuwania blokady."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "Ustawienia komunikatora"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1860,15 +1962,24 @@ msgstr ""
 "MoÅ¼na wysyÅaÄ i odbieraÄ wpisy przez [komunikator](%%doc.im%%) Jabber/GTalk. "
 "Skonfiguruj adres i ustawienia poniÅ¼ej."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "Komunikator nie jest dostÄpny."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Adres komunikatora"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Obecnie potwierdzone adresy Jabber/GTalk."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1878,11 +1989,9 @@ msgstr ""
 "czy otrzymaÅeÅ wiadomoÅÄ z dalszymi instrukcjami (dodaÅeÅ %s do listy "
 "znajomych?)."
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Adres komunikatora"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1891,44 +2000,66 @@ msgstr ""
 "Adres Jabber lub GTalk, taki jak \"NazwaUÅ¼ytkownika@example.org\". Najpierw "
 "upewnij siÄ, Å¼e dodaÅeÅ %s do listy znajomych w komunikatorze lub na GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Preferencje"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "WyÅlij mi wpisy przez Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "WyÅlij wpis, kiedy zmieni siÄ mÃ³j stan na Jabber/GTalk."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "WyÅlij mi odpowiedzi przez Jabber/GTalk od osÃ³b, ktÃ³rych nie subskrybujÄ."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Opublikuj MicroID adresu Jabber/GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Zapisano preferencje."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Brak identyfikatora Jabbera."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Nie moÅ¼na znormalizowaÄ tego identyfikatora Jabbera"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "To nie jest prawidÅowy identyfikator Jabbera"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Ten identyfikator Jabbera jest juÅ¼ twÃ³j."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Identyfikator Jabbera naleÅ¼y juÅ¼ do innego uÅ¼ytkownika."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1937,10 +2068,35 @@ msgstr ""
 "Kod potwierdzajÄcy zostaÅ wysÅany na dodany adres komunikatora. NaleÅ¼y "
 "zaakceptowaÄ otrzymywanie wiadomoÅci od %s."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "To jest bÅÄdny adres komunikatora."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Nie moÅ¼na usunÄÄ potwierdzenia adresu e-mail."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Anulowano potwierdzenie."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "To nie jest twÃ³j identyfikator Jabbera."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Adres zostaÅ usuniÄty."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1983,7 +2139,9 @@ msgstr "ZaproÅ nowych uÅ¼ytkownikÃ³w"
 msgid "You are already subscribed to these users:"
 msgstr "JesteÅ juÅ¼ subskrybowany do tych uÅ¼ytkownikÃ³w:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2107,7 +2265,9 @@ msgstr "Musisz byÄ zalogowany, aby doÅÄczyÄ do grupy."
 msgid "No nickname or ID."
 msgstr "Brak pseudonimu lub identyfikatora."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "UÅ¼ytkownik %1$s doÅÄczyÅ do grupy %2$s"
@@ -2116,11 +2276,13 @@ msgstr "UÅ¼ytkownik %1$s doÅÄczyÅ do grupy %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Musisz byÄ zalogowany, aby opuÅciÄ grupÄ."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "Nie jesteÅ czÅonkiem tej grupy."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "UÅ¼ytkownik %1$s opuÅciÅ grupÄ %2$s"
@@ -2231,12 +2393,12 @@ msgstr "UÅ¼yj tego formularza, aby utworzyÄ nowÄ grupÄ."
 msgid "New message"
 msgstr "Nowa wiadomoÅÄ"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Nie moÅ¼na wysÅaÄ wiadomoÅci do tego uÅ¼ytkownika."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Brak treÅci."
 
@@ -2244,7 +2406,7 @@ msgstr "Brak treÅci."
 msgid "No recipient specified."
 msgstr "Nie podano odbiorcy."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Nie wysyÅaj wiadomoÅci do siebie, po prostu powiedz to sobie po cichu."
@@ -2500,7 +2662,7 @@ msgid "6 or more characters"
 msgstr "6 lub wiÄcej znakÃ³w"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "PotwierdÅº"
 
@@ -3893,44 +4055,74 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Zapisz wpis witryny"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "Ustawienia SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "MoÅ¼na otrzymywaÄ wiadomoÅci SMS przez e-mail od %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "WiadomoÅci SMS nie sÄ dostÄpne."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Adres komunikatora"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Obecnie potwierdzone numery telefonÃ³w z wÅÄczonÄ usÅugÄ SMS."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Oczekiwanie na potwierdzenie tego numeru telefonu."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "Kod potwierdzajÄcy"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Podaj kod, ktÃ³ry otrzymaÅeÅ na telefonie."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "PotwierdÅº"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "Numer telefonu SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Numer telefonu, bez znakÃ³w przestankowych i spacji, z kodem paÅstwa"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Preferencje"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3938,23 +4130,34 @@ msgstr ""
 "WyÅlij mi wpisy przez SMS. Rozumiem, Å¼e mogÄ otrzymywaÄ wiÄksze rachunki od "
 "swojego operatora."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Zapisano preferencje."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Brak numeru telefonu."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Nie wybrano operatora."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Ten numer telefonu jest juÅ¼ twÃ³j."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Ten numer telefonu naleÅ¼y juÅ¼ do innego uÅ¼ytkownika."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -3962,23 +4165,42 @@ msgstr ""
 "Kod potwierdzajÄcy zostaÅ wysÅany na dodany numer telefonu. SprawdÅº telefon, "
 "czy otrzymaÅeÅ kod i instrukcje jak go uÅ¼yÄ."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "To jest bÅÄdny numer potwierdzenia."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Anulowano potwierdzenie."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "To nie jest twÃ³j numer telefonu."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Numer telefonu SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Operator komÃ³rkowy"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Wybierz operatora"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3988,7 +4210,8 @@ msgstr ""
 "wiadomoÅci SMS przez e-mail, a nie znajduje siÄ na liÅcie, wyÅlij wiadomoÅÄ "
 "e-mail na %s (w jÄzyku angielskim), aby nam o tym powiedzieÄ."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Nie podano kodu"
 
@@ -5193,10 +5416,8 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "DomyÅlny dostÄp do tej aplikacji: tylko do odczytu lub do odczytu i zapisu"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -5272,34 +5493,40 @@ msgstr "Polecenie nie powiodÅo siÄ"
 msgid "Notice with that id does not exist"
 msgstr "Wpis z tym identyfikatorem nie istnieje."
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "UÅ¼ytkownik nie posiada ostatniego wpisu."
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Nie moÅ¼na odnaleÅºÄ uÅ¼ytkownika z pseudonimem %s."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Nie moÅ¼na odnaleÅºÄ lokalnego uÅ¼ytkownika z pseudonimem %s."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Te polecenie nie zostaÅo jeszcze zaimplementowane."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Szturchanie samego siebie nie ma zbyt wiele sensu."
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "WysÅano szturchniÄcie do uÅ¼ytkownika %s."
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5310,57 +5537,55 @@ msgstr ""
 "Subskrybenci: %2$s\n"
 "Wpisy: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Zaznaczono wpis jako ulubiony."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "JesteÅ juÅ¼ czÅonkiem tej grupy."
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
 msgstr "Nie moÅ¼na doÅÄczyÄ uÅ¼ytkownika %1$s do grupy %2$s."
 
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "UÅ¼ytkownik %1$s doÅÄczyÅ do grupy %2$s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "Nie moÅ¼na usunÄÄ uÅ¼ytkownika %1$s z grupy %2$s."
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "UÅ¼ytkownik %1$s opuÅciÅ grupÄ %2$s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "ImiÄ i nazwisko: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "PoÅoÅ¼enie: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Strona domowa: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "O mnie: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5369,143 +5594,149 @@ msgstr ""
 "%s to zdalny profil; moÅ¼na wysyÅaÄ bezpoÅrednie wiadomoÅci tylko do "
 "uÅ¼ytkownikÃ³w na tym samym serwerze."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr "WiadomoÅÄ jest za dÅuga - maksymalnie %1$d znakÃ³w, wysÅano %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "WysÅano bezpoÅredniÄ wiadomoÅÄ do uÅ¼ytkownika %s."
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "BÅÄd podczas wysyÅania bezpoÅredniej wiadomoÅci."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "Nie moÅ¼na powtÃ³rzyÄ wÅasnego wpisu"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "JuÅ¼ powtÃ³rzono ten wpis"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "PowtÃ³rzono wpis od uÅ¼ytkownika %s"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "BÅÄd podczas powtarzania wpisu."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Wpis jest za dÅugi - maksymalnie %1$d znakÃ³w, wysÅano %2$d."
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "WysÅano odpowiedÅº do %s."
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "BÅÄd podczas zapisywania wpisu."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Podaj nazwÄ uÅ¼ytkownika do subskrybowania."
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Nie moÅ¼na subskrybowaÄ profili OMB za pomocÄ polecenia."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Subskrybowano uÅ¼ytkownika %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Podaj nazwÄ uÅ¼ytkownika do usuniÄcia subskrypcji."
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "UsuniÄto subskrypcjÄ uÅ¼ytkownika %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Nie zaimplementowano polecenia."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "WyÅÄczono powiadomienia."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "Nie moÅ¼na wyÅÄczyÄ powiadomieÅ."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "WÅÄczono powiadomienia."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Nie moÅ¼na wÅÄczyÄ powiadomieÅ."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "Polecenie logowania jest wyÅÄczone"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 "Tego odnoÅnika moÅ¼na uÅ¼yÄ tylko raz i bÄdzie prawidÅowy tylko przez dwie "
 "minuty: %s."
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "UsuniÄto subskrypcjÄ uÅ¼ytkownika %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "Nie subskrybujesz nikogo."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subskrybujesz tÄ osobÄ:"
 msgstr[1] "Subskrybujesz te osoby:"
 msgstr[2] "Subskrybujesz te osoby:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "Nikt ciÄ nie subskrybuje."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ta osoba ciÄ subskrybuje:"
 msgstr[1] "Te osoby ciÄ subskrybujÄ:"
 msgstr[2] "Te osoby ciÄ subskrybujÄ:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "Nie jesteÅ czÅonkiem Å¼adnej grupy."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "JesteÅ czÅonkiem tej grupy:"
 msgstr[1] "JesteÅ czÅonkiem tych grup:"
 msgstr[2] "JesteÅ czÅonkiem tych grup:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6475,6 +6706,10 @@ msgstr "Brak parametrÃ³w powrotu."
 msgid "Repeat this notice?"
 msgstr "PowtÃ³rzyÄ ten wpis?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Tak"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "PowtÃ³rz ten wpis"
@@ -6662,47 +6897,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "kilka sekund temu"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "okoÅo minutÄ temu"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "okoÅo %d minut temu"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "okoÅo godzinÄ temu"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "okoÅo %d godzin temu"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "blisko dzieÅ temu"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "okoÅo %d dni temu"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "okoÅo miesiÄc temu"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "okoÅo %d miesiÄcy temu"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "okoÅo rok temu"
 
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index c0220c82b0..8d95f07c83 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:07+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:37+0000\n"
 "Language-Team: Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: out-statusnet\n"
@@ -76,8 +76,13 @@ msgstr "Fechado"
 msgid "Save access settings"
 msgstr "Gravar configuraÃ§Ãµes do site"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -109,7 +114,7 @@ msgstr "PÃ¡gina nÃ£o encontrada."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilizador nÃ£o encontrado."
@@ -350,7 +355,7 @@ msgstr "Nenhum estado encontrado com esse ID."
 msgid "This status is already a favorite."
 msgstr "Este estado jÃ¡ Ã© um favorito."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "NÃ£o foi possÃvel criar o favorito."
 
@@ -468,7 +473,7 @@ msgstr "Grupo nÃ£o foi encontrado!"
 msgid "You are already a member of that group."
 msgstr "JÃ¡ Ã© membro desse grupo."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "Foi bloqueado desse grupo pelo gestor."
 
@@ -520,17 +525,17 @@ msgid "Invalid token."
 msgstr "Tamanho invÃ¡lido."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -564,12 +569,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Envio inesperado de formulÃ¡rio."
 
@@ -827,27 +835,44 @@ msgstr ""
 "subscriÃ§Ã£o por este utilizador serÃ¡ cancelada, ele nÃ£o poderÃ¡ subscrevÃª-lo "
 "de futuro e vocÃª nÃ£o receberÃ¡ notificaÃ§Ãµes das @-respostas dele."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "NÃ£o"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "NÃ£o bloquear este utilizador"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sim"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Bloquear este utilizador"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "NÃ£o foi possÃvel gravar informaÃ§Ã£o do bloqueio."
 
@@ -860,8 +885,8 @@ msgstr "NÃ£o foi possÃvel gravar informaÃ§Ã£o do bloqueio."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Grupo nÃ£o foi encontrado."
 
@@ -920,16 +945,24 @@ msgstr "Tipo do endereÃ§o %s nÃ£o reconhecido"
 msgid "That address has already been confirmed."
 msgstr "Esse endereÃ§o jÃ¡ tinha sido confirmado."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "NÃ£o foi possÃvel actualizar o utilizador."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "NÃ£o foi possÃvel apagar a confirmaÃ§Ã£o do endereÃ§o electrÃ³nico."
 
@@ -989,12 +1022,14 @@ msgstr ""
 "Tem a certeza de que quer apagar este utilizador? Todos os dados do "
 "utilizador serÃ£o eliminados da base de dados, sem haver cÃ³pias."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "NÃ£o apagar esta nota"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "Apagar esta nota"
@@ -1030,11 +1065,13 @@ msgstr "Apagar nota"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Tem a certeza de que quer apagar esta nota?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "NÃ£o apagar esta nota"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Apagar esta nota"
 
@@ -1058,7 +1095,8 @@ msgstr ""
 "Tem a certeza de que quer apagar este utilizador? Todos os dados do "
 "utilizador serÃ£o eliminados da base de dados, sem haver cÃ³pias."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Apagar este utilizador"
 
@@ -1171,15 +1209,13 @@ msgid "Reset back to default"
 msgstr "Repor predefiniÃ§Ã£o"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Gravar"
 
@@ -1317,31 +1353,43 @@ msgstr "NÃ£o foi possÃvel criar sinÃ³nimos."
 msgid "Options saved."
 msgstr "OpÃ§Ãµes gravadas."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ConfiguraÃ§Ãµes do correio electrÃ³nico"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Defina como receberÃ¡ mensagens electrÃ³nicas de %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "EndereÃ§o"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "EndereÃ§o de correio electrÃ³nico"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "EndereÃ§o de correio jÃ¡ confirmado."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1349,111 +1397,146 @@ msgstr ""
 "A aguardar a confirmaÃ§Ã£o deste endereÃ§o. Procure na sua caixa de entrada (ou "
 "na caixa de spam!) uma mensagem com mais instruÃ§Ãµes."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "EndereÃ§o de correio electrÃ³nico"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 "EndereÃ§o de correio electrÃ³nico, por ex. \"nomedeutilizador@exemplo.pt\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Adicionar"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Correio recebido"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Envie mensagens electrÃ³nicas para este endereÃ§o para publicar notas."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Crie um endereÃ§o electrÃ³nico novo para publicaÃ§Ãµes; cancela o antigo."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "PreferÃªncias"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Enviem-me notificaÃ§Ã£o electrÃ³nica das novas subscriÃ§Ãµes."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Enviem-me notificaÃ§Ã£o electrÃ³nica quando uma nota minha Ã© adicionada Ã s "
 "favoritas."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "Enviem-me notificaÃ§Ã£o electrÃ³nica quando me enviarem uma mensagem privada."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Enviem-me notificaÃ§Ã£o electrÃ³nica quando me enviarem uma \"@-resposta\"."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir que amigos me toquem e enviem mensagens electrÃ³nicas."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Quero publicar notas por correio electrÃ³nico."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar uma MicroID para o meu endereÃ§o electrÃ³nico."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "PreferÃªncias gravadas."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "PreferÃªncias de estilo foram gravadas."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Sem endereÃ§o de correio electrÃ³nico."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "NÃ£o Ã© possÃvel normalizar esse endereÃ§o electrÃ³nico"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Correio electrÃ³nico Ã© invÃ¡lido."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Esse jÃ¡ Ã© o seu endereÃ§o electrÃ³nico."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Esse endereÃ§o electrÃ³nico jÃ¡ pertence a outro utilizador."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "NÃ£o foi possÃvel inserir o cÃ³digo de confirmaÃ§Ã£o."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1462,43 +1545,56 @@ msgstr ""
 "forneceu. Procure na caixa de entrada (e na caixa de spam!) o cÃ³digo e as "
 "respectivas instruÃ§Ãµes de utilizaÃ§Ã£o."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmaÃ§Ã£o pendente para cancelar."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Esse endereÃ§o de mensagens instantÃ¢neas estÃ¡ errado."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "ConfirmaÃ§Ã£o cancelada."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Esse nÃ£o Ã© o seu endereÃ§o electrÃ³nico."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "O endereÃ§o foi removido."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Sem endereÃ§o electrÃ³nico de entrada."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "NÃ£o foi possÃvel actualizar o registo do utilizador."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "EndereÃ§o electrÃ³nico de entrada foi removido."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Adicionado endereÃ§o electrÃ³nico de entrada novo."
 
@@ -1692,15 +1788,17 @@ msgstr ""
 "\"%2$s\"? Ele serÃ¡ removido do grupo, impossibilitado de publicar e "
 "impossibilitado de subscrever o grupo no futuro."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "NÃ£o bloquear acesso deste utilizador a este grupo"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Bloquear acesso deste utilizador a este grupo"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "Erro na base de dados ao bloquear acesso do utilizador ao grupo."
 
@@ -1883,11 +1981,15 @@ msgstr "Acesso do utilizador ao grupo nÃ£o foi bloqueado."
 msgid "Error removing the block."
 msgstr "Erro ao remover o bloqueio."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "ConfiguraÃ§Ãµes do IM"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1896,15 +1998,24 @@ msgstr ""
 "Pode enviar e receber notas atravÃ©s de [mensagens instantÃ¢neas](%%doc.im%%) "
 "Jabber/GTalk. Configure o seu endereÃ§o e outras definiÃ§Ãµes abaixo."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "MI nÃ£o estÃ¡ disponÃvel."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "EndereÃ§o IM"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "EndereÃ§o do Jabber/GTalk jÃ¡ confirmado."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1914,11 +2025,9 @@ msgstr ""
 "enviadas para a sua conta de Jabber/GTalk. (Adicionou %s Ã  sua lista de "
 "amigos?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "EndereÃ§o IM"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1928,43 +2037,65 @@ msgstr ""
 "Primeiro, certifique-se de que adicionou %s Ã  sua lista de amigos no cliente "
 "MI ou no GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "PreferÃªncias"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Enviar-me notas via Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar uma nota quando o meu estado no Jabber/GTalk se altera."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "Enviar-me via Jabber/GTalk respostas de pessoas que nÃ£o subscrevo."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicar uma MicroID para o meu endereÃ§o Jabber/GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "PreferÃªncias gravadas."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "NÃ£o introduziu o Jabber ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "NÃ£o Ã© possÃvel normalizar esse Jabber ID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID nÃ£o Ã© vÃ¡lido"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Esse jÃ¡ Ã© o seu Jabber ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "O Jabber ID introduzido jÃ¡ pertence a outro utilizador."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1973,10 +2104,35 @@ msgstr ""
 "Um cÃ³digo de confirmaÃ§Ã£o foi enviado para o endereÃ§o fornecido. Tem que "
 "aprovar que %s envie mensagens para si."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Esse endereÃ§o de mensagens instantÃ¢neas estÃ¡ errado."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "NÃ£o foi possÃvel apagar a confirmaÃ§Ã£o do endereÃ§o electrÃ³nico."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "ConfirmaÃ§Ã£o cancelada."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Esse nÃ£o Ã© o seu Jabber ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "O endereÃ§o foi removido."
+
 #: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2021,7 +2177,9 @@ msgstr "Convidar novos utilizadores"
 msgid "You are already subscribed to these users:"
 msgstr "JÃ¡ subscreveu estes utilizadores:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2145,7 +2303,9 @@ msgstr "Precisa de iniciar uma sessÃ£o para se juntar a um grupo."
 msgid "No nickname or ID."
 msgstr "Nenhuma utilizador."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s juntou-se ao grupo %2$s"
@@ -2154,11 +2314,13 @@ msgstr "%1$s juntou-se ao grupo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Precisa de iniciar uma sessÃ£o para deixar um grupo."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "NÃ£o Ã© um membro desse grupo."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
@@ -2274,12 +2436,12 @@ msgstr "Use este formulÃ¡rio para criar um grupo novo."
 msgid "New message"
 msgstr "Mensagem nova"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "NÃ£o pode enviar uma mensagem a este utilizador."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Sem conteÃºdo!"
 
@@ -2287,7 +2449,7 @@ msgstr "Sem conteÃºdo!"
 msgid "No recipient specified."
 msgstr "NÃ£o especificou um destinatÃ¡rio."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "NÃ£o auto-envie uma mensagem; basta lÃª-la baixinho a si prÃ³prio."
@@ -2553,7 +2715,7 @@ msgid "6 or more characters"
 msgstr "6 ou mais caracteres"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "ConfirmaÃ§Ã£o"
 
@@ -3960,44 +4122,74 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Aviso do site"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "ConfiguraÃ§Ãµes de SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Pode receber SMSs do site %%site.name%% por correio electrÃ³nico."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "SMS nÃ£o estÃ¡ disponÃvel."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "EndereÃ§o IM"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "NÃºmero de telefone com serviÃ§o SMS activo jÃ¡ confirmado."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "A aguardar confirmaÃ§Ã£o deste nÃºmero de telefone."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "CÃ³digo de confirmaÃ§Ã£o"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Introduza o cÃ³digo que recebeu no seu telefone."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "ConfirmaÃ§Ã£o"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "NÃºmero de telefone para SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "NÃºmero de telefone, sem pontuaÃ§Ã£o ou espaÃ§os, com cÃ³digo de Ã¡rea"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "PreferÃªncias"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -4005,23 +4197,34 @@ msgstr ""
 "Enviem-me notas por SMS; compreendo que o meu operador poderÃ¡ vir a facturar-"
 "me montantes exorbitantes."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "PreferÃªncias gravadas."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Nenhum nÃºmero de telefone."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Operador nÃ£o foi seleccionado."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Esse jÃ¡ Ã© o seu nÃºmero de telefone."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Esse nÃºmero de telefone jÃ¡ pertence a outro utilizador."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -4030,23 +4233,42 @@ msgstr ""
 "no seu telefone se recebeu o cÃ³digo e as respectivas instruÃ§Ãµes de "
 "utilizaÃ§Ã£o."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Esse nÃºmero de confirmaÃ§Ã£o estÃ¡ errado."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "ConfirmaÃ§Ã£o cancelada."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Esse nÃºmero de telefone nÃ£o Ã© o seu."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "NÃºmero de telefone para SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Operador mÃ³vel"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Seleccione um operador"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4056,7 +4278,8 @@ msgstr ""
 "electrÃ³nico mas nÃ£o estÃ¡ listado, diga-nos enviando um correio electrÃ³nico "
 "para %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Nenhum cÃ³digo introduzido"
 
@@ -5289,10 +5512,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -5366,34 +5587,40 @@ msgstr "Comando falhou"
 msgid "Notice with that id does not exist"
 msgstr "NÃ£o existe nenhuma nota com essa identificaÃ§Ã£o"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "Utilizador nÃ£o tem nenhuma Ãºltima nota"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "NÃ£o foi encontrado um utilizador com a alcunha %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "NÃ£o foi encontrado um utilizador com a alcunha %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Desculpe, este comando ainda nÃ£o foi implementado."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "NÃ£o faz muito sentido tocar-nos a nÃ³s mesmos!"
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Cotovelada enviada a %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5404,198 +5631,202 @@ msgstr ""
 "Subscritores: %2$s\n"
 "Notas: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Nota marcada como favorita."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "JÃ¡ Ã© membro desse grupo"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "NÃ£o foi possÃvel juntar o utilizador %s ao grupo %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s juntou-se ao grupo %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "NÃ£o foi possÃvel adicionar %1$s ao grupo %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "NÃ£o foi possÃvel remover o utilizador %s do grupo %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s deixou o grupo %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Localidade: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "PÃ¡gina pessoal: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Mensagem demasiado extensa - mÃ¡x. %d caracteres, enviou %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Mensagem demasiado extensa - mÃ¡x. %1$d caracteres, enviou %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Mensagem directa para %s enviada"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Erro no envio da mensagem directa."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "NÃ£o pode repetir a sua prÃ³pria nota"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "JÃ¡ repetiu essa nota"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Nota de %s repetida"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Erro ao repetir nota."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Nota demasiado extensa - mÃ¡x. %d caracteres, enviou %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Resposta a %s enviada"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Erro ao gravar nota."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Introduza o nome do utilizador para subscrever"
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "NÃ£o subscreveu esse perfil."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Subscreveu %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Introduza o nome do utilizador para deixar de subscrever"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Deixou de subscrever %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Comando ainda nÃ£o implementado."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "NotificaÃ§Ã£o desligada."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "NÃ£o foi possÃvel desligar a notificaÃ§Ã£o."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "NotificaÃ§Ã£o ligada."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "NÃ£o foi possÃvel ligar a notificaÃ§Ã£o."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "Comando para iniciar sessÃ£o foi desactivado"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 "Esta ligaÃ§Ã£o Ã© utilizÃ¡vel uma Ãºnica vez e sÃ³ durante os prÃ³ximos 2 minutos: %"
 "s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "Deixou de subscrever %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "NÃ£o subscreveu ninguÃ©m."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subscreveu esta pessoa:"
 msgstr[1] "Subscreveu estas pessoas:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "NinguÃ©m subscreve as suas notas."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta pessoa subscreve as suas notas:"
 msgstr[1] "Estas pessoas subscrevem as suas notas:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "NÃ£o estÃ¡ em nenhum grupo."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "EstÃ¡ no grupo:"
 msgstr[1] "EstÃ¡ nos grupos:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 #, fuzzy
 msgid ""
 "Commands:\n"
@@ -6539,6 +6770,10 @@ msgstr "Sem argumentos return-to."
 msgid "Repeat this notice?"
 msgstr "Repetir esta nota?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Sim"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repetir esta nota"
@@ -6728,47 +6963,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderar"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "hÃ¡ alguns segundos"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "hÃ¡ cerca de um minuto"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "hÃ¡ cerca de %d minutos"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "hÃ¡ cerca de uma hora"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "hÃ¡ cerca de %d horas"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "hÃ¡ cerca de um dia"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "hÃ¡ cerca de %d dias"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "hÃ¡ cerca de um mÃªs"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "hÃ¡ cerca de %d meses"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "hÃ¡ cerca de um ano"
 
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 68752209f9..ee53b83465 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:10+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:40+0000\n"
 "Language-Team: Brazilian Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: out-statusnet\n"
@@ -75,8 +75,13 @@ msgstr "Fechado"
 msgid "Save access settings"
 msgstr "Salvar as configuraÃ§Ãµes de acesso"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Salvar"
@@ -107,7 +112,7 @@ msgstr "Esta pÃ¡gina nÃ£o existe."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Este usuÃ¡rio nÃ£o existe."
@@ -352,7 +357,7 @@ msgstr "NÃ£o foi encontrado nenhum status com esse ID."
 msgid "This status is already a favorite."
 msgstr "Esta mensagem jÃ¡ Ã© favorita!"
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "NÃ£o foi possÃvel criar a favorita."
 
@@ -471,7 +476,7 @@ msgstr "O grupo nÃ£o foi encontrado!"
 msgid "You are already a member of that group."
 msgstr "VocÃª jÃ¡ Ã© membro desse grupo."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador desse grupo bloqueou sua inscriÃ§Ã£o."
 
@@ -522,17 +527,17 @@ msgid "Invalid token."
 msgstr "Token invÃ¡lido."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -568,12 +573,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "O token %s solicitado foi negado e revogado."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "SubmissÃ£o inesperada de formulÃ¡rio."
 
@@ -834,27 +842,44 @@ msgstr ""
 "nenhuma notificaÃ§Ã£o acerca de qualquer citaÃ§Ã£o (@usuÃ¡rio) que ele fizer de "
 "vocÃª."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "NÃ£o"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "NÃ£o bloquear este usuÃ¡rio"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Sim"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Bloquear este usuÃ¡rio"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "NÃ£o foi possÃvel salvar a informaÃ§Ã£o de bloqueio."
 
@@ -867,8 +892,8 @@ msgstr "NÃ£o foi possÃvel salvar a informaÃ§Ã£o de bloqueio."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Esse grupo nÃ£o existe."
 
@@ -927,16 +952,24 @@ msgstr "Tipo de endereÃ§o desconhecido %s"
 msgid "That address has already been confirmed."
 msgstr "Esse endereÃ§o jÃ¡ foi confirmado."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "NÃ£o foi possÃvel atualizar o usuÃ¡rio."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "NÃ£o foi possÃvel excluir a confirmaÃ§Ã£o de e-mail."
 
@@ -991,11 +1024,13 @@ msgstr ""
 "desta aplicaÃ§Ã£o do banco de dados, incluindo todas as conexÃµes existentes "
 "com os usuÃ¡rios."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "NÃ£o excluir esta aplicaÃ§Ã£o"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Excluir esta aplicaÃ§Ã£o"
 
@@ -1030,11 +1065,13 @@ msgstr "Excluir a mensagem"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Tem certeza que deseja excluir esta mensagem?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "NÃ£o excluir esta mensagem."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Excluir esta mensagem"
 
@@ -1058,7 +1095,8 @@ msgstr ""
 "Tem certeza que deseja excluir este usuÃ¡rio? Isso eliminarÃ¡ todos os dados "
 "deste usuÃ¡rio do banco de dados, sem cÃ³pia de seguranÃ§a."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Excluir este usuÃ¡rio"
 
@@ -1171,15 +1209,13 @@ msgid "Reset back to default"
 msgstr "Restaura de volta ao padrÃ£o"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Salvar"
 
@@ -1305,31 +1341,43 @@ msgstr "NÃ£o foi possÃvel criar os apelidos."
 msgid "Options saved."
 msgstr "As configuraÃ§Ãµes foram salvas."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ConfiguraÃ§Ãµes do e-mail"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Configure o recebimento de e-mails de %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "EndereÃ§o"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "EndereÃ§o de e-mail"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "EndereÃ§o de e-mail jÃ¡ confirmado."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Remover"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1337,110 +1385,145 @@ msgstr ""
 "Aguardando a confirmaÃ§Ã£o deste endereÃ§o. Procure em sua caixa de entrada (e "
 "de spam!) por uma mensagem com mais instruÃ§Ãµes."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "EndereÃ§o de e-mail"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "EndereÃ§o de e-mail, ex: \"usuario@exemplo.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Adicionar"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "E-mail de recebimento"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Envie e-mails para esse endereÃ§o para publicar novas mensagens."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Cria um novo endereÃ§o de e-mail para publicar e cancela o antigo."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Novo"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "PreferÃªncias"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Envie-me notificaÃ§Ãµes de novos assinantes por e-mail."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Envie-me um e-mail quando alguÃ©m adicionar alguma mensagem minha como "
 "favorita."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Envie-me um e-mail quando alguÃ©m me mandar uma mensagem particular."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "Envie-me um e-mail quando alguÃ©m mandar uma mensagem citando meu nome "
 "(\"@nome\")."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permita que meus amigos chamem minha atenÃ§Ã£o e enviem-me e-mails."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Eu quero publicar mensagens por e-mail."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publique um MicroID para meu endereÃ§o de e-mail."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "As preferÃªncias foram salvas."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "As configuraÃ§Ãµes da aparÃªncia foram salvas."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Nenhum endereÃ§o de e-mail."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "NÃ£o foi possÃvel normalizar este endereÃ§o de e-mail"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "NÃ£o Ã© um endereÃ§o de e-mail vÃ¡lido."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Esse jÃ¡ Ã© seu endereÃ§o de e-mail."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Esse endereÃ§o de e-mail jÃ¡ pertence Ã  outro usuÃ¡rio."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "NÃ£o foi possÃvel inserir o cÃ³digo de confirmaÃ§Ã£o."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1449,43 +1532,56 @@ msgstr ""
 "informou. Verifique a sua caixa de entrada (e de spam!) para o cÃ³digo e "
 "instruÃ§Ãµes sobre como usÃ¡-lo."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Nenhuma confirmaÃ§Ã£o pendente para cancelar."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Isso Ã© um endereÃ§o de MI errado."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "A confirmaÃ§Ã£o foi cancelada."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Esse nÃ£o Ã© seu endereÃ§o de email."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "O endereÃ§o foi removido."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Nenhum endereÃ§o de e-mail para recebimentos."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "NÃ£o foi possÃvel atualizar o registro do usuÃ¡rio."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "O endereÃ§o de e-mail de recebimento foi removido."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 "Foi adicionado um novo endereÃ§o de e-mail para recebimento de mensagens."
@@ -1678,15 +1774,17 @@ msgstr ""
 "serÃ¡ removido do grupo e impossibilitado de publicar e de se juntar ao grupo "
 "futuramente."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "NÃ£o bloquear este usuÃ¡rio neste grupo"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Bloquear este usuÃ¡rio neste grupo"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 "Ocorreu um erro no banco de dados ao tentar bloquear o usuÃ¡rio no grupo."
@@ -1870,11 +1968,15 @@ msgstr "O usuÃ¡rio nÃ£o estÃ¡ bloqueado no grupo."
 msgid "Error removing the block."
 msgstr "Erro na remoÃ§Ã£o do bloqueio."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "ConfiguraÃ§Ãµes do MI"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1883,15 +1985,24 @@ msgstr ""
 "VocÃª pode enviar e receber mensagens atravÃ©s dos [mensageiros instantÃ¢neos](%"
 "%doc.im%%) Jabber/GTalk. Configure seu endereÃ§o e opÃ§Ãµes abaixo."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "MI nÃ£o estÃ¡ disponÃvel"
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "EndereÃ§o do MI"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "EndereÃ§o de Jabber/GTalk jÃ¡ confirmado."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1901,11 +2012,9 @@ msgstr ""
 "GTalk por uma mensagem com mais instruÃ§Ãµes (VocÃª adicionou %s Ã  sua lista de "
 "contatos?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "EndereÃ§o do MI"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1915,45 +2024,67 @@ msgstr ""
 "certifique-se de adicionar %s Ã  sua lista de contatos em seu cliente de MI "
 "ou no GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "PreferÃªncias"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Envie-me mensagens via Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Publicar uma mensagem quando eu mudar de status no Jabber/GTalk."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Envie-me respostas de pessoas que eu nÃ£o estou assinando atravÃ©s do Jabber/"
 "GTalk."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publique um MicroID para meu endereÃ§o de Jabber/Gtalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "As preferÃªncias foram salvas."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Nenhuma ID de Jabber."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "NÃ£o foi possÃvel normalizar essa ID do Jabber"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "NÃ£o Ã© uma ID de Jabber vÃ¡lida"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Essa jÃ¡ Ã© sua ID do Jabber."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Esta ID do Jabber jÃ¡ pertence Ã  outro usuÃ¡rio."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1962,10 +2093,35 @@ msgstr ""
 "Um cÃ³digo de confirmaÃ§Ã£o foi enviado para o endereÃ§o de IM que vocÃª "
 "informou. VocÃª deve permitir que %s envie mensagens para vocÃª."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Isso Ã© um endereÃ§o de MI errado."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "NÃ£o foi possÃvel excluir a confirmaÃ§Ã£o de e-mail."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "A confirmaÃ§Ã£o foi cancelada."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Essa nÃ£o Ã© sua ID do Jabber."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "O endereÃ§o foi removido."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2009,7 +2165,9 @@ msgstr "Convidar novos usuÃ¡rios"
 msgid "You are already subscribed to these users:"
 msgstr "VocÃª jÃ¡ estÃ¡ assinando esses usuÃ¡rios:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2132,7 +2290,9 @@ msgstr "VocÃª deve estar autenticado para se associar a um grupo."
 msgid "No nickname or ID."
 msgstr "Nenhum apelido ou identificaÃ§Ã£o."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s associou-se ao grupo %2$s"
@@ -2141,11 +2301,13 @@ msgstr "%1$s associou-se ao grupo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "VocÃª deve estar autenticado para sair de um grupo."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "VocÃª nÃ£o Ã© um membro desse grupo."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
@@ -2260,12 +2422,12 @@ msgstr "Utilize este formulÃ¡rio para criar um novo grupo."
 msgid "New message"
 msgstr "Nova mensagem"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "VocÃª nÃ£o pode enviar mensagens para este usuÃ¡rio."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Nenhum conteÃºdo!"
 
@@ -2273,7 +2435,7 @@ msgstr "Nenhum conteÃºdo!"
 msgid "No recipient specified."
 msgstr "NÃ£o foi especificado nenhum destinatÃ¡rio."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2536,7 +2698,7 @@ msgid "6 or more characters"
 msgstr "No mÃnimo 6 caracteres"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Confirmar"
 
@@ -3936,44 +4098,74 @@ msgstr "Texto dos avisos do site (no mÃ¡ximo 255 caracteres; pode usar HTML)"
 msgid "Save site notice"
 msgstr "Salvar os avisos do site"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "ConfiguraÃ§Ã£o do SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "VocÃª pode receber mensagens SMS de %%site.name%% atravÃ©s do e-mail."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "SMS nÃ£o estÃ¡ disponÃvel."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "EndereÃ§o do MI"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "NÃºmero de telefone jÃ¡ habilitado para receber SMS."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Aguardando a confirmaÃ§Ã£o deste nÃºmero de telefone."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "CÃ³digo de confirmaÃ§Ã£o"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Informe o cÃ³digo que vocÃª recebeu no seu telefone."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Confirmar"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "Telefone para SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "NÃºmero de telefone, sem pontuaÃ§Ã£o ou espaÃ§os, com cÃ³digo de Ã¡rea"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "PreferÃªncias"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3981,23 +4173,34 @@ msgstr ""
 "Envie-me mensagens via SMS. Eu compreendo que isso pode gerar cobranÃ§as "
 "exorbitantes da minha operadora."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "As preferÃªncias foram salvas."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Nenhum nÃºmero de telefone."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "NÃ£o foi selecionada nenhuma operadora."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Esse jÃ¡ Ã© seu nÃºmero de telefone."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Esse nÃºmero de telefone jÃ¡ pertence Ã  outro usuÃ¡rio."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -4005,23 +4208,42 @@ msgstr ""
 "Um cÃ³digo de confirmaÃ§Ã£o foi enviado para o nÃºmero de telefone que vocÃª "
 "informou. Verifique no seu telefone o cÃ³digo e instruÃ§Ãµes sobre como usÃ¡-lo."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Isso Ã© um nÃºmero de confirmaÃ§Ã£o errado."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "A confirmaÃ§Ã£o foi cancelada."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Esse nÃ£o Ã© seu nÃºmero de telefone."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Telefone para SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "Operadora de celular"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Selecione uma operadora"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4030,7 +4252,8 @@ msgstr ""
 "A operadora do seu celular. Se vocÃª conhece uma operadora que aceita SMS via "
 "e-mail que nÃ£o estÃ¡ listada aqui, informe-nos enviando uma mensagem para %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "NÃ£o foi digitado nenhum cÃ³digo"
 
@@ -5232,10 +5455,8 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "Acesso padrÃ£o para esta aplicaÃ§Ã£o: somente leitura ou leitura e escrita"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -5311,34 +5532,40 @@ msgstr "O comando falhou"
 msgid "Notice with that id does not exist"
 msgstr "NÃ£o existe uma mensagem com essa id"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "O usuÃ¡rio nÃ£o tem uma \"Ãºltima mensagem\""
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "NÃ£o foi possÃvel encontrar um usuÃ¡rio com a identificaÃ§Ã£o %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "NÃ£o foi possÃvel encontrar um usuÃ¡rio local com a identificaÃ§Ã£o %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "Desculpe, mas esse comando ainda nÃ£o foi implementado."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "NÃ£o faz muito sentido chamar a sua prÃ³pria atenÃ§Ã£o!"
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Foi enviada a chamada de atenÃ§Ã£o para %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5349,57 +5576,55 @@ msgstr ""
 "Assinantes: %2$s\n"
 "Mensagens: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Mensagem marcada como favorita."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "VocÃª jÃ¡ Ã© um membro desse grupo."
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "NÃ£o foi possÃvel associar o usuÃ¡rio %s ao grupo %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s associou-se ao grupo %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "NÃ£o foi possÃvel associar o usuÃ¡rio %1$s ao grupo %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "NÃ£o foi possÃvel remover o usuÃ¡rio %s do grupo %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s deixou o grupo %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "LocalizaÃ§Ã£o: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5408,142 +5633,148 @@ msgstr ""
 "%s Ã© um perfil remoto; vocÃª pode sÃ³ pode enviar mensagens diretas para "
 "usuÃ¡rios do mesmo servidor."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
-"A mensagem Ã© muito extensa - o mÃ¡ximo sÃ£o %d caracteres e vocÃª enviou %d"
+"A mensagem Ã© muito extensa - o mÃ¡ximo sÃ£o %1$d caracteres e vocÃª enviou %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "A mensagem direta para %s foi enviada"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Ocorreu um erro durante o envio da mensagem direta."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "VocÃª nÃ£o pode repetir sua prÃ³pria mensagem"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "VocÃª jÃ¡ repetiu essa mensagem"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Mensagem de %s repetida"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Erro na repetiÃ§Ã£o da mensagem."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 "A mensagem Ã© muito extensa - o mÃ¡ximo sÃ£o %d caracteres e vocÃª enviou %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "A resposta a %s foi enviada"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Erro no salvamento da mensagem."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Especifique o nome do usuÃ¡rio que serÃ¡ assinado"
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "NÃ£o Ã© possÃvel assinar perfis OMB com comandos."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Efetuada a assinatura de %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Especifique o nome do usuÃ¡rio cuja assinatura serÃ¡ cancelada"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Cancelada a assinatura de %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "O comando nÃ£o foi implementado ainda."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "NotificaÃ§Ã£o desligada."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "NÃ£o Ã© possÃvel desligar a notificaÃ§Ã£o."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "NotificaÃ§Ã£o ligada."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "NÃ£o Ã© possÃvel ligar a notificaÃ§Ã£o."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "O comando para autenticaÃ§Ã£o estÃ¡ desabilitado"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 "Este link Ã© utilizÃ¡vel somente uma vez e Ã© vÃ¡lido somente por dois minutos: %"
 "s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "Cancelada a assinatura de %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "VocÃª nÃ£o estÃ¡ assinando ninguÃ©m."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "VocÃª jÃ¡ estÃ¡ assinando esta pessoa:"
 msgstr[1] "VocÃª jÃ¡ estÃ¡ assinando estas pessoas:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "NinguÃ©m o assinou ainda."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta pessoa estÃ¡ assinando vocÃª:"
 msgstr[1] "Estas pessoas estÃ£o assinando vocÃª:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "VocÃª nÃ£o Ã© membro de nenhum grupo."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "VocÃª Ã© membro deste grupo:"
 msgstr[1] "VocÃª Ã© membro destes grupos:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6489,6 +6720,10 @@ msgstr "Sem argumentos return-to."
 msgid "Repeat this notice?"
 msgstr "Repetir esta mensagem?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Sim"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Repetir esta mensagem"
@@ -6675,47 +6910,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderador"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "alguns segundos atrÃ¡s"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "cerca de 1 minuto atrÃ¡s"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "cerca de %d minutos atrÃ¡s"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "cerca de 1 hora atrÃ¡s"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "cerca de %d horas atrÃ¡s"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "cerca de 1 dia atrÃ¡s"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "cerca de %d dias atrÃ¡s"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "cerca de 1 mÃªs atrÃ¡s"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "cerca de %d meses atrÃ¡s"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "cerca de 1 ano atrÃ¡s"
 
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 8fe51a80c6..64a9934d1c 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:16+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:43+0000\n"
 "Language-Team: Russian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: out-statusnet\n"
@@ -77,8 +77,13 @@ msgstr "ÐÐ°ÐºÑÑÑÐ°"
 msgid "Save access settings"
 msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð´Ð¾ÑÑÑÐ¿Ð°"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ"
@@ -108,7 +113,7 @@ msgstr "ÐÐµÑ ÑÐ°ÐºÐ¾Ð¹ ÑÑÑÐ°Ð½Ð¸ÑÑ."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ÐÐµÑ ÑÐ°ÐºÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
@@ -350,7 +355,7 @@ msgstr "ÐÐµÑ ÑÑÐ°ÑÑÑÐ° Ñ ÑÐ°ÐºÐ¸Ð¼ ID."
 msgid "This status is already a favorite."
 msgstr "ÐÑÐ¾Ñ ÑÑÐ°ÑÑÑ ÑÐ¶Ðµ Ð²ÑÐ¾Ð´Ð¸Ñ Ð² ÑÐ¸ÑÐ»Ð¾ Ð»ÑÐ±Ð¸Ð¼ÑÑ."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð»ÑÐ±Ð¸Ð¼ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ."
 
@@ -471,7 +476,7 @@ msgstr "ÐÑÑÐ¿Ð¿Ð° Ð½Ðµ Ð½Ð°Ð¹Ð´ÐµÐ½Ð°."
 msgid "You are already a member of that group."
 msgstr "ÐÑ ÑÐ¶Ðµ ÑÐ²Ð»ÑÐµÑÐµÑÑ ÑÐ»ÐµÐ½Ð¾Ð¼ ÑÑÐ¾Ð¹ Ð³ÑÑÐ¿Ð¿Ñ."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "ÐÑ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ñ Ð¸Ð· ÑÑÐ¾Ð¹ Ð³ÑÑÐ¿Ð¿Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÐ¾Ð¼."
 
@@ -522,17 +527,17 @@ msgid "Invalid token."
 msgstr "ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ ÑÐ¾ÐºÐµÐ½"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -564,12 +569,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "ÐÐ°Ð¿ÑÐ¾Ñ ÑÐ¾ÐºÐµÐ½Ð° %s Ð±ÑÐ» Ð·Ð°Ð¿ÑÐµÑÐµÐ½ Ð¸ Ð°Ð½Ð½ÑÐ»Ð¸ÑÐ¾Ð²Ð°Ð½."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "ÐÐµÑÐ¸Ð¿Ð¾Ð²Ð¾Ðµ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ ÑÐ¾ÑÐ¼Ñ."
 
@@ -829,27 +837,44 @@ msgstr ""
 "Ð±ÑÐ´ÐµÑ Ð¾ÑÐ¿Ð¸ÑÐ°Ð½ Ð¾Ñ Ð²Ð°Ñ Ð±ÐµÐ· Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°ÑÑÑÑ Ð² Ð±ÑÐ´ÑÑÐµÐ¼, Ð° Ð²Ð°Ð¼ Ð½Ðµ Ð±ÑÐ´ÑÑ "
 "Ð¿ÑÐ¸ÑÐ¾Ð´Ð¸ÑÑ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ Ð¾Ð± @-Ð¾ÑÐ²ÐµÑÐ°Ñ Ð¾Ñ Ð½ÐµÐ³Ð¾."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "ÐÐµÑ"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "ÐÐµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "ÐÐ°"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸."
 
@@ -862,8 +887,8 @@ msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð±Ð»Ð¾Ðº
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "ÐÐµÑ ÑÐ°ÐºÐ¾Ð¹ Ð³ÑÑÐ¿Ð¿Ñ."
 
@@ -922,16 +947,24 @@ msgstr "ÐÐµÑÐ°ÑÐ¿Ð¾Ð·Ð½Ð°Ð½Ð½ÑÐ¹ ÑÐ¸Ð¿ Ð°Ð´ÑÐµÑÐ° %s."
 msgid "That address has already been confirmed."
 msgstr "ÐÑÐ¾Ñ Ð°Ð´ÑÐµÑ ÑÐ¶Ðµ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÑÐ½."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð¿Ð¾Ð´Ð²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¼Ñ Ð°Ð´ÑÐµÑÑ."
 
@@ -986,11 +1019,13 @@ msgstr ""
 "Ð¿ÑÐ¸Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¸ Ð¸Ð· Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ, Ð²ÐºÐ»ÑÑÐ°Ñ Ð²ÑÐµ ÑÑÑÐµÑÑÐ²ÑÑÑÐ¸Ðµ Ð¿Ð¾Ð´ÐºÐ»ÑÑÐµÐ½Ð¸Ñ "
 "Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "ÐÐµ ÑÐ´Ð°Ð»ÑÐ¹ÑÐµ ÑÑÐ¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÐ¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ"
 
@@ -1025,11 +1060,13 @@ msgstr "Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ"
 msgid "Are you sure you want to delete this notice?"
 msgstr "ÐÑ ÑÐ²ÐµÑÐµÐ½Ñ, ÑÑÐ¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÑ?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "ÐÐµ ÑÐ´Ð°Ð»ÑÑÑ ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÑ"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÑ"
 
@@ -1053,7 +1090,8 @@ msgstr ""
 "ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ? ÐÑÐ¾ Ð¿Ð¾Ð²Ð»ÐµÑÑÑ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ "
 "Ð²ÑÐµÑ Ð´Ð°Ð½Ð½ÑÑ Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ Ð¸Ð· Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ Ð±ÐµÐ· Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ Ð²Ð¾ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Ð£Ð´Ð°Ð»Ð¸ÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ"
 
@@ -1166,15 +1204,13 @@ msgid "Reset back to default"
 msgstr "ÐÐ¾ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ"
 
@@ -1300,31 +1336,43 @@ msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð°Ð»Ð¸Ð°ÑÑ."
 msgid "Options saved."
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ñ."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð¾ÑÑÑ"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Ð£Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¾ÑÐµÑÑÐ¾Ð¼ Ð¿Ð¾Ð»ÑÑÐµÐ½Ð¸Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ Ñ %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "ÐÐ´ÑÐµÑ"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "ÐÐ´ÑÐµÑ ÑÐ». Ð¿Ð¾ÑÑÑ"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÑÐ½Ð½ÑÐ¹ Ð² Ð½Ð°ÑÑÐ¾ÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Ð£Ð±ÑÐ°ÑÑ"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1332,116 +1380,151 @@ msgstr ""
 "ÐÐ¶Ð¸Ð´Ð°Ð½Ð¸Ðµ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ ÑÑÐ¾Ð³Ð¾ Ð°Ð´ÑÐµÑÐ°. ÐÑÐ¾Ð²ÐµÑÑÑÐµ ÑÐ²Ð¾Ð¹ Ð¿Ð¾ÑÑÐ¾Ð²ÑÐ¹ ÑÑÐ¸Ðº (Ð¸ Ð¿Ð°Ð¿ÐºÑ "
 "Ð´Ð»Ñ ÑÐ¿Ð°Ð¼Ð°!), ÑÐ°Ð¼ Ð±ÑÐ´ÑÑ Ð´Ð°Ð»ÑÐ½ÐµÐ¹ÑÐ¸Ðµ Ð¸Ð½ÑÑÑÑÐºÑÐ¸Ð¸."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "ÐÑÐ¼ÐµÐ½Ð¸ÑÑ"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "ÐÐ´ÑÐµÑ ÑÐ». Ð¿Ð¾ÑÑÑ"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ÐÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ Ð²Ð¸Ð´Ð° \"UserName@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "ÐÐ¾Ð±Ð°Ð²Ð¸ÑÑ"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ÐÑÐ¾Ð´ÑÑÐ¸Ð¹ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 "ÐÑÐ¿ÑÐ°Ð²Ð»ÑÐ¹ÑÐµ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐµ Ð¿Ð¸ÑÑÐ¼Ð° Ð½Ð° ÑÑÐ¾Ñ Ð°Ð´ÑÐµÑ Ð´Ð»Ñ Ð¾ÑÑÑÐ»ÐºÐ¸ Ð½Ð¾Ð²ÑÑ Ð·Ð°Ð¿Ð¸ÑÐµÐ¹."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð½Ð¾Ð²ÑÐ¹ Ð°Ð´ÑÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÑ Ð´Ð»Ñ Ð¾ÑÑÑÐ»ÐºÐ¸ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹; Ð¾ÑÐ¼ÐµÐ½ÑÐµÑ ÑÑÐ°ÑÑÐ¹ "
 "Ð°Ð´ÑÐµÑ."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "ÐÐ¾Ð²ÑÐ¹"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "ÐÑÐµÐ´Ð¿Ð¾ÑÑÐµÐ½Ð¸Ñ"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Ð£Ð²ÐµÐ´Ð¾Ð¼Ð»ÑÑÑ Ð¼ÐµÐ½Ñ Ð¾ Ð½Ð¾Ð²ÑÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÑÐ¸ÐºÐ°Ñ Ð¿Ð¾ Ð¿Ð¾ÑÑÐµ."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "ÐÐ¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÐµ, ÐµÑÐ»Ð¸ ÐºÑÐ¾-Ð½Ð¸Ð±ÑÐ´Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ Ð¼Ð¾Ñ "
 "Ð·Ð°Ð¿Ð¸ÑÑ Ð² ÑÐ¸ÑÐ»Ð¾ Ð»ÑÐ±Ð¸Ð¼ÑÑ."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 "ÐÐ¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÐµ, ÐµÑÐ»Ð¸ ÐºÑÐ¾-Ð½Ð¸Ð±ÑÐ´Ñ Ð¿Ð¾ÑÐ»ÑÑ Ð¼Ð½Ðµ "
 "Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 "ÐÐ¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÐµ, ÐµÑÐ»Ð¸ ÐºÑÐ¾-Ð½Ð¸Ð±ÑÐ´Ñ Ð¿Ð¾ÑÐ»ÑÑ Ð¼Ð½Ðµ Â«@-"
 "Ð¾ÑÐ²ÐµÑÂ»."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 "Ð Ð°Ð·ÑÐµÑÐ¸ÑÑ Ð´ÑÑÐ·ÑÑÐ¼ Â«Ð¿Ð¾Ð´ÑÐ°Ð»ÐºÐ¸Ð²Ð°ÑÑÂ» Ð¼ÐµÐ½Ñ Ð¸ Ð¿Ð¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Ð¯ ÑÐ¾ÑÑ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÐ¸ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÐµ."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "ÐÐ¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°ÑÑ MicroID Ð´Ð»Ñ Ð¼Ð¾ÐµÐ³Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "ÐÑÐµÐ´Ð¿Ð¾ÑÑÐµÐ½Ð¸Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ñ."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð¾ÑÐ¾ÑÐ¼Ð»ÐµÐ½Ð¸Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ñ."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "ÐÐµÑ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "ÐÑÐ¾ ÑÐ¶Ðµ ÐÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "ÐÑÐ¾Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ ÑÐ¶Ðµ Ð·Ð°Ð´ÐµÐ¹ÑÑÐ²Ð¾Ð²Ð°Ð½ Ð´ÑÑÐ³Ð¸Ð¼ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð²ÑÑÐ°Ð²Ð¸ÑÑ ÐºÐ¾Ð´ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1450,43 +1533,56 @@ msgstr ""
 "Ð¿Ð°Ð¿ÐºÑ Ð²ÑÐ¾Ð´ÑÑÐµÐ¹ Ð¿Ð¾ÑÑÑ (Ð° ÑÐ°ÐºÐ¶Ðµ Ð¿Ð°Ð¿ÐºÑ ÑÐ¿Ð°Ð¼Ð°!), ÑÑÐ¾Ð±Ñ Ð½Ð°Ð¹ÑÐ¸ ÑÑÐ¾Ñ ÐºÐ¾Ð´Ð° Ð¸ "
 "Ð¸Ð½ÑÑÑÑÐºÑÐ¸Ð¸ Ð¿Ð¾ ÐµÐ³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ÐÐµÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð¾ÑÐºÐ°Ð·Ð°."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "ÐÑÐ¾ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ IM-Ð°Ð´ÑÐµÑ."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¾ÑÐ¼ÐµÐ½ÐµÐ½Ð¾."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "ÐÑÐ¾ Ð½Ðµ ÐÐ°Ñ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "ÐÐ´ÑÐµÑ ÑÐ´Ð°Ð»ÑÐ½."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÐÐµÑ Ð²ÑÐ¾Ð´ÑÑÐµÐ³Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð³Ð¾ Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¾Ð±Ð½Ð¾Ð²Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÑÐºÑÑ Ð·Ð°Ð¿Ð¸ÑÑ."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ÐÑÐ¾Ð´ÑÑÐ¸Ð¹ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ ÑÐ´Ð°Ð»ÑÐ½."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ÐÐ¾Ð²ÑÐ¹ Ð²ÑÐ¾Ð´ÑÑÐ¸Ð¹ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÐ¹ Ð°Ð´ÑÐµÑ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½."
 
@@ -1677,15 +1773,17 @@ msgstr ""
 "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð±ÑÐ´ÐµÑ ÑÐ´Ð°Ð»ÑÐ½ Ð¸Ð· Ð³ÑÑÐ¿Ð¿Ñ Ð±ÐµÐ· Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÐ¸ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑ Ð¸ "
 "Ð¿Ð¾Ð´Ð¿Ð¸ÑÑÐ²Ð°ÑÑÑÑ Ð½Ð° Ð³ÑÑÐ¿Ð¿Ñ Ð² Ð±ÑÐ´ÑÑÐµÐ¼."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "ÐÐµ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸Ð· ÑÑÐ¾Ð¹ Ð³ÑÑÐ¿Ð¿Ñ"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "ÐÐ°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸Ð· ÑÑÐ¾Ð¹ Ð³ÑÑÐ¿Ð¿Ñ"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð±Ð°Ð·Ñ Ð´Ð°Ð½Ð½ÑÑ Ð¿ÑÐ¸ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ð¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð¸Ð· Ð³ÑÑÐ¿Ð¿Ñ."
 
@@ -1868,11 +1966,15 @@ msgstr "ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½Ðµ Ð·Ð°Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð» Ð²Ð°Ñ Ð¸Ð· Ð³Ñ
 msgid "Error removing the block."
 msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ð¸ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð±Ð»Ð¾ÐºÐ°."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "IM-ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1881,15 +1983,24 @@ msgstr ""
 "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑ Ð¸ Ð¿Ð¾Ð»ÑÑÐ°ÑÑ Ð·Ð°Ð¿Ð¸ÑÐ¸ ÑÐµÑÐµÐ· Jabber/GTalk [Ð¾Ð½Ð»Ð°Ð¹Ð½-Ð¼ÐµÑÑÐµÐ½Ð´Ð¶ÐµÑ]"
 "(%%doc.im%%). ÐÐ°ÑÑÑÐ¾Ð¹ÑÐµ Ð²Ð°Ñ Ð°ÐºÐºÐ°ÑÐ½Ñ Ð¸ Ð¿ÑÐµÐ´Ð¿Ð¾ÑÑÐµÐ½Ð¸Ñ Ð½Ð¸Ð¶Ðµ."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "IM Ð½Ðµ Ð´Ð¾ÑÑÑÐ¿ÐµÐ½."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM-Ð°Ð´ÑÐµÑ"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÑÐ½Ð½ÑÐ¹ Ð² Ð½Ð°ÑÑÐ¾ÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ Jabber/Gtalk - Ð°Ð´ÑÐµÑ."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1899,11 +2010,9 @@ msgstr ""
 "ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ñ Ð´Ð°Ð»ÑÐ½ÐµÐ¹ÑÐ¸Ð¼Ð¸ Ð¸Ð½ÑÑÑÑÐºÑÐ¸ÑÐ¼Ð¸. (ÐÑ Ð²ÐºÐ»ÑÑÐ¸Ð»Ð¸ %s Ð² Ð²Ð°Ñ ÑÐ¿Ð¸ÑÐ¾Ðº "
 "ÐºÐ¾Ð½ÑÐ°ÐºÑÐ¾Ð²?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM-Ð°Ð´ÑÐµÑ"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1913,44 +2022,66 @@ msgstr ""
 "ÑÐ±ÐµÐ´Ð¸ÑÐµÑÑ, ÑÑÐ¾ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸ %s Ð² ÑÐ¿Ð¸ÑÐ¾Ðº ÐÐ°ÑÐ¸Ñ ÐºÐ¾ÑÑÐµÑÐ¿Ð¾Ð½Ð´ÐµÐ½ÑÐ¾Ð² Ð½Ð° ÐÐ°ÑÐµÐ¼ IM-"
 "Ð¼ÐµÑÑÐµÐ½Ð´Ð¶ÐµÑÐµ Ð¸Ð»Ð¸ Ð² GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "ÐÑÐµÐ´Ð¿Ð¾ÑÑÐµÐ½Ð¸Ñ"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "ÐÐ¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸ ÑÐµÑÐµÐ· Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "ÐÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ, ÐºÐ¾Ð³Ð´Ð° Ð¼Ð¾Ð¹ Jabber/GTalk - ÑÑÐ°ÑÑÑ Ð¸Ð·Ð¼ÐµÐ½ÑÐµÑÑÑ."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "ÐÐ¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ ÑÐµÐ¿Ð»Ð¸ÐºÐ¸ ÑÐµÑÐµÐ· Jabber/GTalk Ð¾Ñ Ð»ÑÐ´ÐµÐ¹, Ð½Ð° ÐºÐ¾ÑÐ¾ÑÑÑ Ñ Ð½Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ÐÐ¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°ÑÑ MicroID Ð´Ð»Ñ Ð¼Ð¾ÐµÐ³Ð¾ Jabber/GTalk - Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "ÐÑÐµÐ´Ð¿Ð¾ÑÑÐµÐ½Ð¸Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ñ."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "ÐÐµ Jabber ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÑÐ°Ð½Ð´Ð°ÑÑÐ¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐ¾Ñ Jabber ID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "ÐÐµÐ²ÐµÑÐ½ÑÐ¹ ÐºÐ¾Ð´ Jabber ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "ÐÑÐ¾ ÑÐ¶Ðµ ÐÐ°Ñ Jabber ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "ÐÑÐ¾Ñ Jabber ID ÑÐ¶Ðµ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð´ÑÑÐ³Ð¸Ð¼ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1959,10 +2090,35 @@ msgstr ""
 "ÐÐ¾Ð´ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð²ÑÑÐ»Ð°Ð½ Ð½Ð° Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð½ÑÐ¹ Ð²Ð°Ð¼Ð¸ IM-Ð°Ð´ÑÐµÑ. ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ´Ð¸ÑÑ "
 "%s Ð´Ð»Ñ Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐ¸ Ð²Ð°Ð¼ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ð¹."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "ÐÑÐ¾ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ IM-Ð°Ð´ÑÐµÑ."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð¿Ð¾Ð´Ð²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¼Ñ Ð°Ð´ÑÐµÑÑ."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¾ÑÐ¼ÐµÐ½ÐµÐ½Ð¾."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "ÐÑÐ¾ Ð½Ðµ ÐÐ°Ñ Jabber ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "ÐÐ´ÑÐµÑ ÑÐ´Ð°Ð»ÑÐ½."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2007,7 +2163,9 @@ msgstr "ÐÑÐ¸Ð³Ð»Ð°ÑÐ¸ÑÑ Ð½Ð¾Ð²ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¹"
 msgid "You are already subscribed to these users:"
 msgstr "ÐÑ ÑÐ¶Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ Ð½Ð° Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2130,7 +2288,9 @@ msgstr "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð¾Ð²Ð°ÑÑÑÑ Ð´Ð»Ñ Ð²ÑÑÑÐ¿Ð»ÐµÐ½Ð¸
 msgid "No nickname or ID."
 msgstr "ÐÐµÑ Ð¸Ð¼ÐµÐ½Ð¸ Ð¸Ð»Ð¸ ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s Ð²ÑÑÑÐ¿Ð¸Ð» Ð² Ð³ÑÑÐ¿Ð¿Ñ %2$s"
@@ -2139,11 +2299,13 @@ msgstr "%1$s Ð²ÑÑÑÐ¿Ð¸Ð» Ð² Ð³ÑÑÐ¿Ð¿Ñ %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "ÐÑ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð°Ð²ÑÐ¾ÑÐ¸Ð·Ð¾Ð²Ð°ÑÑÑÑ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾ÐºÐ¸Ð½ÑÑÑ Ð³ÑÑÐ¿Ð¿Ñ."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "ÐÑ Ð½Ðµ ÑÐ²Ð»ÑÐµÑÐµÑÑ ÑÐ»ÐµÐ½Ð¾Ð¼ ÑÑÐ¾Ð¹ Ð³ÑÑÐ¿Ð¿Ñ."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s Ð¿Ð¾ÐºÐ¸Ð½ÑÐ» Ð³ÑÑÐ¿Ð¿Ñ %2$s"
@@ -2253,12 +2415,12 @@ msgstr "ÐÑÐ¿Ð¾Ð»ÑÐ·ÑÐ¹ÑÐµ ÑÑÑ ÑÐ¾ÑÐ¼Ñ Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²
 msgid "New message"
 msgstr "ÐÐ¾Ð²Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "ÐÑ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¿Ð¾ÑÐ»Ð°ÑÑ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ ÑÑÐ¾Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "ÐÐµÑ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°!"
 
@@ -2266,7 +2428,7 @@ msgstr "ÐÐµÑ ÐºÐ¾Ð½ÑÐµÐ½ÑÐ°!"
 msgid "No recipient specified."
 msgstr "ÐÐµÑ Ð°Ð´ÑÐµÑÐ°ÑÐ°."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "ÐÐµ Ð¿Ð¾ÑÑÐ»Ð°Ð¹ÑÐµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ ÑÐ°Ð¼Ð¸ ÑÐµÐ±Ðµ; Ð¿ÑÐ¾ÑÑÐ¾ Ð¿Ð¾ÑÐ¸ÑÐ¾Ð½ÑÐºÑ ÑÐºÐ°Ð¶Ð¸ÑÐµ ÑÑÐ¾ ÑÐµÐ±Ðµ."
@@ -2523,7 +2685,7 @@ msgid "6 or more characters"
 msgstr "6 Ð¸Ð»Ð¸ Ð±Ð¾Ð»ÑÑÐµ Ð·Ð½Ð°ÐºÐ¾Ð²"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ"
 
@@ -3912,46 +4074,76 @@ msgstr "Ð¢ÐµÐºÑÑ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ñ ÑÐ°Ð¹ÑÐ° (Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼ 255 ÑÐ¸
 msgid "Save site notice"
 msgstr "Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÐ²ÐµÐ´Ð¾Ð¼Ð»ÐµÐ½Ð¸Ðµ ÑÐ°Ð¹ÑÐ°"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸ Ð¡ÐÐ¡"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑ Ð¡ÐÐ¡-ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¼Ñ Ð°Ð´ÑÐµÑÑ Ð¾Ñ %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "ÐÑÐ¿ÑÐ°Ð²ÐºÐ° Ð¡ÐÐ¡ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð°."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM-Ð°Ð´ÑÐµÑ"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÑÐ½Ð½ÑÐ¹ Ð² Ð½Ð°ÑÑÐ¾ÑÑÐµÐµ Ð²ÑÐµÐ¼Ñ SMS-Ð´Ð¾ÑÑÑÐ¿Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ Ð¼Ð¾Ð±Ð¸Ð»ÑÐ½Ð¾Ð³Ð¾ ÑÐµÐ»ÐµÑÐ¾Ð½Ð°."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "Ð Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ð¸ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð½Ð¾Ð¼ÐµÑÐ° ÑÐµÐ»ÐµÑÐ¾Ð½Ð°."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "ÐÐ¾Ð´ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "ÐÐ²ÐµÐ´Ð¸ÑÐµ ÐºÐ¾Ð´, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð²Ñ Ð¿Ð¾Ð»ÑÑÐ¸Ð»Ð¸ Ð¿Ð¾ ÑÐµÐ»ÐµÑÐ¾Ð½Ñ."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "ÐÐ¾Ð¼ÐµÑ ÑÐµÐ»ÐµÑÐ¾Ð½Ð° Ð´Ð»Ñ Ð¡ÐÐ¡"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "ÐÐ¾Ð¼ÐµÑ ÑÐµÐ»ÐµÑÐ¾Ð½Ð°, Ð±ÐµÐ· Ð¿ÑÐ¾Ð±ÐµÐ»Ð¾Ð², Ñ ÐºÐ¾Ð´Ð¾Ð¼ Ð·Ð¾Ð½Ñ"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "ÐÑÐµÐ´Ð¿Ð¾ÑÑÐµÐ½Ð¸Ñ"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3959,23 +4151,34 @@ msgstr ""
 "ÐÐ¾ÑÑÐ»Ð°ÑÑ Ð¼Ð½Ðµ Ð·Ð°Ð¿Ð¸ÑÐ¸ ÑÐµÑÐµÐ· Ð¡ÐÐ¡; Ñ Ð¿Ð¾Ð½Ð¸Ð¼Ð°Ñ, ÑÑÐ¾ ÑÑÐ¾ Ð¼Ð¾Ð¶ÐµÑ Ð¿ÑÐ¸Ð²ÐµÑÑÐ¸ Ðº ÑÐ°ÑÑÐ¾Ð´Ð°Ð¼ "
 "Ð¿Ð¾ Ð¿ÐµÑÐµÑÑÐ»ÐºÐµ."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "ÐÑÐµÐ´Ð¿Ð¾ÑÑÐµÐ½Ð¸Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ñ."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "ÐÐµÑ Ð½Ð¾Ð¼ÐµÑÐ° ÑÐµÐ»ÐµÑÐ¾Ð½Ð°."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "ÐÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑ Ð½Ðµ Ð²ÑÐ±ÑÐ°Ð½."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "ÐÑÐ¾ ÑÐ¶Ðµ Ð²Ð°Ñ Ð½Ð¾Ð¼ÐµÑ ÑÐµÐ»ÐµÑÐ¾Ð½Ð°."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "ÐÑÐ¾Ñ ÑÐµÐ»ÐµÑÐ¾Ð½Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ ÑÐ¶Ðµ Ð·Ð°Ð´ÐµÐ¹ÑÑÐ²Ð¾Ð²Ð°Ð½ Ð´ÑÑÐ³Ð¸Ð¼ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -3983,23 +4186,42 @@ msgstr ""
 "ÐÐ¾Ð´ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ Ð²ÑÑÐ»Ð°Ð½ Ð½Ð° Ð¼Ð¾Ð±Ð¸Ð»ÑÐ½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ, ÐºÐ¾ÑÐ¾ÑÑÐ¹ Ð²Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð»Ð¸. ÐÑÐ¾Ð²ÐµÑÑÑÐµ "
 "ÑÐµÐ»ÐµÑÐ¾Ð½ Ð´Ð»Ñ Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ñ ÑÑÐ¾Ð³Ð¾ ÐºÐ¾Ð´Ð° Ð¸ Ð¸Ð½ÑÑÑÑÐºÑÐ¸Ð¹ Ð¿Ð¾ ÐµÐ³Ð¾ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "ÐÑÐ¾ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ñ."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "ÐÐ¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¾ÑÐ¼ÐµÐ½ÐµÐ½Ð¾."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "ÐÑÐ¾ Ð½Ðµ ÐÐ°Ñ Ð½Ð¾Ð¼ÐµÑ ÑÐµÐ»ÐµÑÐ¾Ð½Ð°."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "ÐÐ¾Ð¼ÐµÑ ÑÐµÐ»ÐµÑÐ¾Ð½Ð° Ð´Ð»Ñ Ð¡ÐÐ¡"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "ÐÑÐ±Ð¾Ñ Ð¿ÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑÐ°"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "ÐÑÐ±Ð¾Ñ Ð¿ÑÐ¾Ð²Ð°Ð¹Ð´ÐµÑÐ°"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4009,7 +4231,8 @@ msgstr ""
 "Ð¿ÑÐ¸Ð½Ð¸Ð¼Ð°ÐµÑ Ð¡ÐÐ¡ Ð¿ÑÐ¸ Ð¿Ð¾Ð¼Ð¾ÑÐ¸ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½ÑÑ Ð°Ð´ÑÐµÑÐ¾Ð² Ð¸ ÐºÐ¾ÑÐ¾ÑÐ¾Ð³Ð¾ Ð½ÐµÑ Ð² ÑÐ¿Ð¸ÑÐºÐµ Ð½Ð¸Ð¶Ðµ, "
 "ÑÐ¾ ÑÐ¾Ð¾Ð±ÑÐ¸ÑÐµ Ð½Ð°Ð¼ Ð¾Ð± ÑÑÐ¾Ð¼ Ð¿Ð¾ ÑÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ð¹ Ð¿Ð¾ÑÑÐµ %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "ÐÐ¾Ð´ Ð½Ðµ Ð²Ð²ÐµÐ´ÑÐ½"
 
@@ -5209,10 +5432,8 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "ÐÐ¾ÑÑÑÐ¿ Ð¿Ð¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ: ÑÐ¾Ð»ÑÐºÐ¾ ÑÑÐµÐ½Ð¸Ðµ Ð¸Ð»Ð¸ ÑÑÐµÐ½Ð¸Ðµ Ð¸ Ð·Ð°Ð¿Ð¸ÑÑ"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "ÐÑÐ¼ÐµÐ½Ð¸ÑÑ"
 
@@ -5288,34 +5509,40 @@ msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð½ÐµÑÐ´Ð°ÑÐ½Ð°"
 msgid "Notice with that id does not exist"
 msgstr "ÐÐ°Ð¿Ð¸ÑÐ¸ Ñ ÑÐ°ÐºÐ¸Ð¼ id Ð½Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "Ð£ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð½ÐµÑ Ð¿Ð¾ÑÐ»ÐµÐ´Ð½ÐµÐ¹ Ð·Ð°Ð¿Ð¸ÑÐ¸."
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð½Ð°Ð¹ÑÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð½Ð°Ð¹ÑÐ¸ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "ÐÑÐ¾ÑÑÐ¸ÑÐµ, ÑÑÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð° ÐµÑÑ Ð½Ðµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð°."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "ÐÐµÑ ÑÐ¼ÑÑÐ»Ð° Â«Ð¿Ð¾Ð´ÑÐ°Ð»ÐºÐ¸Ð²Ð°ÑÑÂ» ÑÐ°Ð¼Ð¾Ð³Ð¾ ÑÐµÐ±Ñ!"
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Â«ÐÐ¾Ð´ÑÐ°Ð»ÐºÐ¸Ð²Ð°Ð½Ð¸ÐµÂ» Ð¿Ð¾ÑÐ»Ð°Ð½Ð¾ %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5326,57 +5553,55 @@ msgstr ""
 "ÐÐ¾Ð´Ð¿Ð¸ÑÑÐ¸ÐºÐ¾Ð²: %2$s\n"
 "ÐÐ°Ð¿Ð¸ÑÐµÐ¹: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "ÐÐ°Ð¿Ð¸ÑÑ Ð¿Ð¾Ð¼ÐµÑÐµÐ½Ð° ÐºÐ°Ðº Ð»ÑÐ±Ð¸Ð¼Ð°Ñ."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "ÐÑ ÑÐ¶Ðµ ÑÐ²Ð»ÑÐµÑÐµÑÑ ÑÐ»ÐµÐ½Ð¾Ð¼ ÑÑÐ¾Ð¹ Ð³ÑÑÐ¿Ð¿Ñ."
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¿ÑÐ¸ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ %s Ðº Ð³ÑÑÐ¿Ð¿Ðµ %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%1$s Ð²ÑÑÑÐ¿Ð¸Ð» Ð² Ð³ÑÑÐ¿Ð¿Ñ %2$s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ Ð¿ÑÐ¸ÑÐ¾ÐµÐ´Ð¸Ð½Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ %1$s Ðº Ð³ÑÑÐ¿Ð¿Ðµ %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "ÐÐµ ÑÐ´Ð°ÑÑÑÑ ÑÐ´Ð°Ð»Ð¸ÑÑ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ %1$s Ð¸Ð· Ð³ÑÑÐ¿Ð¿Ñ %2$s."
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%1$s Ð¿Ð¾ÐºÐ¸Ð½ÑÐ» Ð³ÑÑÐ¿Ð¿Ñ %2$s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "ÐÐ¾Ð»Ð½Ð¾Ðµ Ð¸Ð¼Ñ: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "ÐÐµÑÑÐ¾ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "ÐÐ¾Ð¼Ð°ÑÐ½ÑÑ ÑÑÑÐ°Ð½Ð¸ÑÐ°: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Ð Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ðµ: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5385,141 +5610,148 @@ msgstr ""
 "%s Ð¿ÑÐ¾ÑÐ¸Ð»Ñ Ð´ÑÑÐ³Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ; Ð²Ñ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¾ÑÑÑÐ»Ð°ÑÑ Ð»Ð¸ÑÐ½Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ ÑÐ¾Ð»ÑÐºÐ¾ "
 "Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÑÐ¼ ÑÑÐ¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ñ."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ â Ð½Ðµ Ð±Ð¾Ð»ÑÑÐµ %d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð², Ð²Ñ Ð¿Ð¾ÑÑÐ»Ð°ÐµÑÐµ %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr ""
+"Ð¡Ð¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð¾Ðµ â Ð½Ðµ Ð±Ð¾Ð»ÑÑÐµ %1$d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð², Ð²Ñ Ð¾ÑÐ¿ÑÐ°Ð²Ð¸Ð»Ð¸ %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "ÐÑÑÐ¼Ð¾Ðµ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ðµ Ð´Ð»Ñ %s Ð¿Ð¾ÑÐ»Ð°Ð½Ð¾."
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð¾ÑÐ¿ÑÐ°Ð²ÐºÐµ Ð¿ÑÑÐ¼Ð¾Ð³Ð¾ ÑÐ¾Ð¾Ð±ÑÐµÐ½Ð¸Ñ."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÑ ÑÐ¾Ð±ÑÑÐ²ÐµÐ½Ð½ÑÑ Ð·Ð°Ð¿Ð¸ÑÑ."
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "ÐÑÐ° Ð·Ð°Ð¿Ð¸ÑÑ ÑÐ¶Ðµ Ð¿Ð¾Ð²ÑÐ¾ÑÐµÐ½Ð°"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "ÐÐ°Ð¿Ð¸ÑÑ %s Ð¿Ð¾Ð²ÑÐ¾ÑÐµÐ½Ð°"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "ÐÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐµÐ½Ð¸Ð¸ Ð·Ð°Ð¿Ð¸ÑÐ¸."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "ÐÐ°Ð¿Ð¸ÑÑ ÑÐ»Ð¸ÑÐºÐ¾Ð¼ Ð´Ð»Ð¸Ð½Ð½Ð°Ñ â Ð½Ðµ Ð±Ð¾Ð»ÑÑÐµ %d ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð², Ð²Ñ Ð¿Ð¾ÑÑÐ»Ð°ÐµÑÐµ %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "ÐÑÐ²ÐµÑ %s Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ñ Ñ ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸ÐµÐ¼ Ð·Ð°Ð¿Ð¸ÑÐ¸."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Ð£ÐºÐ°Ð¶Ð¸ÑÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð´Ð»Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÐ¸."
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°ÑÑÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ð¹ Ð½Ð° Ð¿ÑÐ¾ÑÐ¸Ð»Ð¸ OMB."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "ÐÐ¾Ð´Ð¿Ð¸ÑÐ°Ð½Ð¾ Ð½Ð° %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Ð£ÐºÐ°Ð¶Ð¸ÑÐµ Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ Ð´Ð»Ñ Ð¾ÑÐ¼ÐµÐ½Ñ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐºÐ¸."
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "ÐÑÐ¿Ð¸ÑÐ°Ð½Ð¾ Ð¾Ñ %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ÐµÑÑ Ð½Ðµ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð°."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "ÐÐ¿Ð¾Ð²ÐµÑÐµÐ½Ð¸Ðµ Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "ÐÐµÑ Ð¾Ð¿Ð¾Ð²ÐµÑÐµÐ½Ð¸Ñ."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "ÐÑÑÑ Ð¾Ð¿Ð¾Ð²ÐµÑÐµÐ½Ð¸Ðµ."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "ÐÑÑÑ Ð¾Ð¿Ð¾Ð²ÐµÑÐµÐ½Ð¸Ðµ."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð²ÑÐ¾Ð´Ð° Ð¾ÑÐºÐ»ÑÑÐµÐ½Ð°"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr "ÐÑÐ° ÑÑÑÐ»ÐºÐ° Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð° ÑÐ¾Ð»ÑÐºÐ¾ Ð¾Ð´Ð¸Ð½ ÑÐ°Ð· Ð² ÑÐµÑÐµÐ½Ð¸Ðµ 2 Ð¼Ð¸Ð½ÑÑ: %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "ÐÑÐ¿Ð¸ÑÐ°Ð½Ð¾ %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "ÐÑ Ð½Ð¸ Ð½Ð° ÐºÐ¾Ð³Ð¾ Ð½Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ÐÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ Ð½Ð° ÑÑÐ¸Ñ Ð»ÑÐ´ÐµÐ¹:"
 msgstr[1] "ÐÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ Ð½Ð° ÑÑÐ¸Ñ Ð»ÑÐ´ÐµÐ¹:"
 msgstr[2] "ÐÑ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½Ñ Ð½Ð° ÑÑÐ¸Ñ Ð»ÑÐ´ÐµÐ¹:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "ÐÐ¸ÐºÑÐ¾ Ð½Ðµ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð½ Ð½Ð° Ð²Ð°Ñ."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "ÐÑÐ¸ Ð»ÑÐ´Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð»Ð¸ÑÑ Ð½Ð° Ð²Ð°Ñ:"
 msgstr[1] "ÐÑÐ¸ Ð»ÑÐ´Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð»Ð¸ÑÑ Ð½Ð° Ð²Ð°Ñ:"
 msgstr[2] "ÐÑÐ¸ Ð»ÑÐ´Ð¸ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ°Ð»Ð¸ÑÑ Ð½Ð° Ð²Ð°Ñ:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "ÐÑ Ð½Ðµ ÑÐ¾ÑÑÐ¾Ð¸ÑÐµ Ð½Ð¸ Ð² Ð¾Ð´Ð½Ð¾Ð¹ Ð³ÑÑÐ¿Ð¿Ðµ."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ÐÑ ÑÐ²Ð»ÑÐµÑÐµÑÑ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ Ð³ÑÑÐ¿Ð¿:"
 msgstr[1] "ÐÑ ÑÐ²Ð»ÑÐµÑÐµÑÑ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ Ð³ÑÑÐ¿Ð¿:"
 msgstr[2] "ÐÑ ÑÐ²Ð»ÑÐµÑÐµÑÑ ÑÑÐ°ÑÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÐ»ÐµÐ´ÑÑÑÐ¸Ñ Ð³ÑÑÐ¿Ð¿:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6487,6 +6719,10 @@ msgstr "ÐÐµÑ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÐ° return-to."
 msgid "Repeat this notice?"
 msgstr "ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÑ ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÑ?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "ÐÐ°"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÑ ÑÑÑ Ð·Ð°Ð¿Ð¸ÑÑ"
@@ -6673,47 +6909,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "ÐÐ¾Ð´ÐµÑÐ°ÑÐ¾Ñ"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "Ð¿Ð°ÑÑ ÑÐµÐºÑÐ½Ð´ Ð½Ð°Ð·Ð°Ð´"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ Ð¼Ð¸Ð½ÑÑÑ Ð½Ð°Ð·Ð°Ð´"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ %d Ð¼Ð¸Ð½ÑÑ(Ñ) Ð½Ð°Ð·Ð°Ð´"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ ÑÐ°ÑÐ° Ð½Ð°Ð·Ð°Ð´"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ %d ÑÐ°ÑÐ°(Ð¾Ð²) Ð½Ð°Ð·Ð°Ð´"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ Ð´Ð½Ñ Ð½Ð°Ð·Ð°Ð´"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ %d Ð´Ð½Ñ(ÐµÐ¹) Ð½Ð°Ð·Ð°Ð´"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ Ð¼ÐµÑÑÑÐ° Ð½Ð°Ð·Ð°Ð´"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ %d Ð¼ÐµÑÑÑÐ°(ÐµÐ²) Ð½Ð°Ð·Ð°Ð´"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "Ð¾ÐºÐ¾Ð»Ð¾ Ð³Ð¾Ð´Ð° Ð½Ð°Ð·Ð°Ð´"
 
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 61d593bcf6..c7ecc89f08 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -69,8 +69,13 @@ msgstr ""
 msgid "Save access settings"
 msgstr ""
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
@@ -100,7 +105,7 @@ msgstr ""
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr ""
@@ -329,7 +334,7 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr ""
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr ""
 
@@ -445,7 +450,7 @@ msgstr ""
 msgid "You are already a member of that group."
 msgstr ""
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -496,17 +501,17 @@ msgid "Invalid token."
 msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -537,12 +542,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -794,27 +802,42 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+msgctxt "BUTTON"
 msgid "No"
 msgstr ""
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr ""
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr ""
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr ""
 
@@ -827,8 +850,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr ""
 
@@ -887,16 +910,24 @@ msgstr ""
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr ""
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr ""
 
@@ -948,11 +979,13 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr ""
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr ""
 
@@ -985,11 +1018,13 @@ msgstr ""
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr ""
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr ""
 
@@ -1011,7 +1046,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr ""
 
@@ -1122,15 +1158,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
 
@@ -1256,178 +1290,229 @@ msgstr ""
 msgid "Options saved."
 msgstr ""
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr ""
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
 msgstr ""
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr ""
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr ""
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr ""
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+msgctxt "BUTTON"
 msgid "Add"
 msgstr ""
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+msgid "Email preferences"
 msgstr ""
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr ""
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+msgid "Email preferences saved."
 msgstr ""
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr ""
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr ""
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr ""
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr ""
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr ""
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+msgid "That is the wrong email address."
 msgstr ""
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+msgid "Email confirmation cancelled."
 msgstr ""
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr ""
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+msgid "The email address was removed."
 msgstr ""
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr ""
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr ""
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1609,15 +1694,17 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr ""
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr ""
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1785,90 +1872,144 @@ msgstr ""
 msgid "Error removing the block."
 msgstr ""
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr ""
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr ""
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr ""
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr ""
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+msgid "IM preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr ""
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr ""
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr ""
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr ""
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+msgid "Couldn't delete IM confirmation."
+msgstr ""
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+msgid "IM confirmation cancelled."
+msgstr ""
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr ""
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+msgid "The IM address was removed."
+msgstr ""
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1909,7 +2050,9 @@ msgstr ""
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2002,7 +2145,9 @@ msgstr ""
 msgid "No nickname or ID."
 msgstr ""
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
@@ -2011,11 +2156,13 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr ""
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr ""
@@ -2120,12 +2267,12 @@ msgstr ""
 msgid "New message"
 msgstr ""
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr ""
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr ""
 
@@ -2133,7 +2280,7 @@ msgstr ""
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2380,7 +2527,7 @@ msgid "6 or more characters"
 msgstr ""
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr ""
 
@@ -3674,95 +3821,150 @@ msgstr ""
 msgid "Save site notice"
 msgstr ""
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr ""
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr ""
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+msgid "SMS address"
+msgstr ""
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr ""
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr ""
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+msgid "SMS preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+msgid "SMS preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr ""
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr ""
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+msgid "SMS confirmation cancelled."
+msgstr ""
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr ""
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+msgid "The SMS phone number was removed."
+msgstr ""
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr ""
 
@@ -4902,9 +5104,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr ""
 
@@ -4977,34 +5178,40 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr ""
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr ""
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr ""
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr ""
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5012,195 +5219,199 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr ""
 
-#: lib/command.php:331
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
 #, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
 msgstr ""
 
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
 #, php-format
-msgid "%s joined group %s"
+msgid "Could not remove user %s from group %s"
 msgstr ""
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
-msgstr ""
-
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr ""
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr ""
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr ""
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr ""
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr ""
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr ""
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr ""
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr ""
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr ""
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr ""
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr ""
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6021,6 +6232,10 @@ msgstr ""
 msgid "Repeat this notice?"
 msgstr ""
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr ""
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr ""
@@ -6207,47 +6422,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr ""
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr ""
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr ""
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr ""
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr ""
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr ""
 
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index be55652d38..91bf80f89c 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:19+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:46+0000\n"
 "Language-Team: Swedish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: out-statusnet\n"
@@ -73,8 +73,13 @@ msgstr "StÃ¤ngd"
 msgid "Save access settings"
 msgstr "Spara instÃ¤llningar fÃ¶r Ã¥tkomst"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "Spara"
@@ -104,7 +109,7 @@ msgstr "Ingen sÃ¥dan sida"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen sÃ¥dan anvÃ¤ndare."
@@ -342,7 +347,7 @@ msgstr "Ingen status hittad med det ID:t."
 msgid "This status is already a favorite."
 msgstr "Denna status Ã¤r redan en favorit."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "Kunde inte skapa favorit."
 
@@ -459,7 +464,7 @@ msgstr "Grupp hittades inte."
 msgid "You are already a member of that group."
 msgstr "Du Ã¤r redan en medlem i denna grupp."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blivit blockerad frÃ¥n denna grupp av administratÃ¶ren."
 
@@ -510,17 +515,17 @@ msgid "Invalid token."
 msgstr "Ogiltig token."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -551,12 +556,15 @@ msgstr "BegÃ¤ran-token %s har godkÃ¤nts. Byt ut den mot en Ã¥tkomst-token."
 msgid "The request token %s has been denied and revoked."
 msgstr "BegÃ¤ran-token %s har nekats och Ã¥terkallats."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "OvÃ¤ntat inskick av formulÃ¤r."
 
@@ -815,27 +823,44 @@ msgstr ""
 "prenumeration pÃ¥ dig tas bort, de kommer inte kunna prenumerera pÃ¥ dig i "
 "framtiden och du kommer inte bli underrÃ¤ttad om nÃ¥gra @-svar frÃ¥n dem."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "Nej"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "Blockera inte denna anvÃ¤ndare"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ja"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "Blockera denna anvÃ¤ndare"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "Misslyckades att spara blockeringsinformation."
 
@@ -848,8 +873,8 @@ msgstr "Misslyckades att spara blockeringsinformation."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Ingen sÃ¥dan grupp."
 
@@ -909,16 +934,24 @@ msgstr "Adresstypen %s kÃ¤nns inte igen."
 msgid "That address has already been confirmed."
 msgstr "Denna adress har redan blivit bekrÃ¤ftad."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "Kunde inte uppdatera anvÃ¤ndare."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Kunde inte ta bort e-postbekrÃ¤ftelse."
 
@@ -973,11 +1006,13 @@ msgstr ""
 "bort all data om applikationen frÃ¥n databasen, inklusive alla befintliga "
 "anvÃ¤ndaranslutningar."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "Ta inte bort denna applikation"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "Ta bort denna applikation"
 
@@ -1012,11 +1047,13 @@ msgstr "Ta bort notis"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ãr du sÃ¤ker pÃ¥ att du vill ta bort denna notis?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "Ta inte bort denna notis"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "Ta bort denna notis"
 
@@ -1040,7 +1077,8 @@ msgstr ""
 "Ãr du sÃ¤ker pÃ¥ att du vill ta bort denna anvÃ¤ndare? Det kommer rensa all "
 "data om anvÃ¤ndaren frÃ¥n databasen, utan en sÃ¤kerhetskopia."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "Ta bort denna anvÃ¤ndare"
 
@@ -1153,15 +1191,13 @@ msgid "Reset back to default"
 msgstr "ÃterstÃ¤ll till standardvÃ¤rde"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Spara"
 
@@ -1287,31 +1323,43 @@ msgstr "Kunde inte skapa alias."
 msgid "Options saved."
 msgstr "Alternativ sparade."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "E-postinstÃ¤llningar"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Hantera hur du fÃ¥r e-post frÃ¥n %%site.name%%"
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adress"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "E-postadress"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "Aktuell, bekrÃ¤ftad e-postadress."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "Ta bort"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1319,107 +1367,141 @@ msgstr ""
 "VÃ¤ntar bekrÃ¤ftelse av denna adress. Kontrollera din inkorg (och "
 "skrÃ¤ppostkorg!) efter ett meddelande med vidare instruktioner."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "E-postadress"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "E-postadress, sÃ¥som \"anvÃ¤ndarnamn@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "LÃ¤gg till"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "Inkommande e-post"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Skicka e-post till denna adress fÃ¶r att posta nya notiser."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 "Ange en ny e-postadress fÃ¶r att posta till; detta inaktiverar den gamla."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "Ny"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "InstÃ¤llningar"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "Skicka notiser om nya prenumerationer till mig genom e-post."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Skicka mig e-post nÃ¤r nÃ¥gon lÃ¤gger till min notis som en favorit."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Skicka mig e-post nÃ¤r nÃ¥gon skickar mig ett privat meddelande."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Skicka mig e-post nÃ¤r nÃ¥gon skickar ett \"@-svar\"."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "TillÃ¥t vÃ¤nner att knuffa mig och skicka e-post till mig."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Jag vill posta notiser genom min e-post."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Publicera ett MicroID fÃ¶r min e-postadress."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "InstÃ¤llningar sparade."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "UtseendeinstÃ¤llningar sparade."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Ingen e-postadress."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Kan inte normalisera den e-postadressen"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Inte en giltig e-postadress."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Det Ã¤r redan din e-postadress."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Den e-postadressen tillhÃ¶r redan en annan anvÃ¤ndare."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Kunde inte infoga bekrÃ¤ftelsekod."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1428,43 +1510,56 @@ msgstr ""
 "din inkorg (och skrÃ¤ppostkorg!) fÃ¶r koden och instruktioner hur du anvÃ¤nder "
 "den."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ingen vÃ¤ntande bekrÃ¤ftelse att avbryta."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Detta Ã¤r fel IM-adress."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "BekrÃ¤ftelse avbruten."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Det Ã¤r inte din e-postadress."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Adressen togs bort."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "Ingen inkommande e-postadress."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "Kunde inte uppdatera anvÃ¤ndaruppgift."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "Inkommande e-postadress borttagen."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "Ny inkommande e-postadress tillagd."
 
@@ -1655,15 +1750,17 @@ msgstr ""
 "\"? De kommer bli borttagna frÃ¥n gruppen, inte kunna skriva till och inte "
 "kunna prenumerera pÃ¥ gruppen i framtiden."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "Blockera inte denna anvÃ¤ndare frÃ¥n denna grupp"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Blockera denna anvÃ¤ndare frÃ¥n denna grupp"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "Databasfel vid blockering av anvÃ¤ndare frÃ¥n grupp."
 
@@ -1846,11 +1943,15 @@ msgstr "AnvÃ¤ndare Ã¤r inte blockerad frÃ¥n grupp."
 msgid "Error removing the block."
 msgstr "Fel vid hÃ¤vning av blockering."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "InstÃ¤llningar fÃ¶r snabbmeddelanden"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1859,15 +1960,24 @@ msgstr ""
 "Du kan skicka och ta emot notiser genom Jabber/GTalk-[snabbmeddelanden](%%"
 "doc.im%%). Konfigurera din adress och dina instÃ¤llningar nedan."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "IM Ã¤r inte tillgÃ¤nglig."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "Adress fÃ¶r snabbmeddelanden"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Aktuell bekrÃ¤ftad Jabber/Gtalk-adress."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1876,11 +1986,9 @@ msgstr ""
 "VÃ¤ntar pÃ¥ bekrÃ¤ftelse fÃ¶r denna adress. Kontrollera ditt Jabber/GTalk-konto "
 "fÃ¶r vidare instruktioner. (La du till %s i din kompislista?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "Adress fÃ¶r snabbmeddelanden"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1889,45 +1997,67 @@ msgstr ""
 "Jabber- eller GTalk-adress, som \"anvÃ¤ndarnamn@example.org\". Se fÃ¶rst till "
 "att lÃ¤gga till %s i din kompislista i din IM-klient eller hos GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "InstÃ¤llningar"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Skicka notiser till mig genom Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Posta en notis nÃ¤r min Jabber/GTalk-status Ã¤ndras."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Skicka svar till mig genom Jabber/GTalk frÃ¥n personer som jag inte "
 "prenumererar pÃ¥."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Publicera ett MicroID fÃ¶r min Jabber/GTalk-adress."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "InstÃ¤llningar sparade."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Inget Jabber-ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Kan inte normalisera detta Jabber-ID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Inte ett giltigt Jabber-ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Detta Ã¤r redan ditt Jabber-ID"
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber-ID:t tillhÃ¶r redan en annan anvÃ¤ndare."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1936,10 +2066,35 @@ msgstr ""
 "En bekrÃ¤ftelsekod skickades till den IM-adress du angav. Du mÃ¥ste godkÃ¤nna "
 "att %s fÃ¥r skicka meddelanden till dig."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Detta Ã¤r fel IM-adress."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Kunde inte ta bort e-postbekrÃ¤ftelse."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "BekrÃ¤ftelse avbruten."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Detta Ã¤r inte ditt Jabber-ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Adressen togs bort."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1981,7 +2136,9 @@ msgstr "Bjud in nya anvÃ¤ndare"
 msgid "You are already subscribed to these users:"
 msgstr "Du prenumererar redan pÃ¥ dessa anvÃ¤ndare:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2106,7 +2263,9 @@ msgstr "Du mÃ¥ste vara inloggad fÃ¶r att kunna gÃ¥ med i en grupp."
 msgid "No nickname or ID."
 msgstr "Inget smeknamn eller ID."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s gick med i grupp %2$s"
@@ -2115,11 +2274,13 @@ msgstr "%1$s gick med i grupp %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Du mÃ¥ste vara inloggad fÃ¶r att lÃ¤mna en grupp."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "Du Ã¤r inte en medlem i den gruppen."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s lÃ¤mnade grupp %2$s"
@@ -2228,12 +2389,12 @@ msgstr "AnvÃ¤nd detta formulÃ¤r fÃ¶r att skapa en ny grupp."
 msgid "New message"
 msgstr "Nytt meddelande"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "Du kan inte skicka ett meddelande till den anvÃ¤ndaren."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Inget innehÃ¥ll!"
 
@@ -2241,7 +2402,7 @@ msgstr "Inget innehÃ¥ll!"
 msgid "No recipient specified."
 msgstr "Ingen mottagare angiven."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2499,7 +2660,7 @@ msgid "6 or more characters"
 msgstr "Minst 6 tecken"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "BekrÃ¤fta"
 
@@ -3890,44 +4051,74 @@ msgstr "Text fÃ¶r webbplatsnotis (max 255 tecken; HTML ok)"
 msgid "Save site notice"
 msgstr "Spara webbplatsnotis"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "InstÃ¤llningar fÃ¶r SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Du kan ta emot SMS-meddelanden genom e-post frÃ¥n %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "SMS Ã¤r inte tillgÃ¤ngligt."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "Adress fÃ¶r snabbmeddelanden"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "Nuvarande bekÃ¤ftat telefonnummer fÃ¶r SMS."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "VÃ¤ntar bekrÃ¤ftelse fÃ¶r detta telefonnummer."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "BekrÃ¤ftelsekod"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Fyll i koden du mottog i din telefon."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "BekrÃ¤fta"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "Telefonnummer fÃ¶r SMS"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Telefonnummer, inga punkter eller mellanslag, med landskod"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "InstÃ¤llningar"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3935,23 +4126,34 @@ msgstr ""
 "Skicka notiser till mig via SMS. Jag Ã¤r infÃ¶rstÃ¥dd med att min operatÃ¶r kan "
 "debitera mig."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "InstÃ¤llningar sparade."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Inget telefonnummer."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "Ingen operatÃ¶r vald."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Detta Ã¤r redan ditt telefonnummer."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Detta telefonnumr tillhÃ¶r redan en annan anvÃ¤ndare."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -3959,23 +4161,42 @@ msgstr ""
 "En bekrÃ¤ftelsekod skickades till det telefonnummer du lagt till. Kontrollera "
 "din telefon fÃ¶r koden och instruktioner om hur du anvÃ¤nder den."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Detta Ã¤r fel bekrÃ¤ftelsenummer."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "BekrÃ¤ftelse avbruten."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Detta Ã¤r inte ditt telefonnummer."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Telefonnummer fÃ¶r SMS"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "MobiloperatÃ¶r"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "VÃ¤lj en operatÃ¶r"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3985,7 +4206,8 @@ msgstr ""
 "SMS via e-post men som inte finns med i listan, skicka ett e-post till oss "
 "pÃ¥ %s och berÃ¤tta."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "Ingen kod ifylld"
 
@@ -4012,7 +4234,6 @@ msgid "Invalid snapshot report URL."
 msgstr "Ogiltig rapport-URL fÃ¶r Ã¶gonblicksbild"
 
 #: actions/snapshotadminpanel.php:200
-#, fuzzy
 msgid "Randomly during web hit"
 msgstr "SlumpmÃ¤ssigt vid webbfÃ¶rfrÃ¥gningar"
 
@@ -4601,7 +4822,7 @@ msgstr "Kunde inte uppdatera meddelande med ny URI."
 
 #. TRANS: Server exception. %s are the error details.
 #: classes/Notice.php:176
-#, fuzzy, php-format
+#, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Databasfel vid infogning av hashtag: %s"
 
@@ -5182,34 +5403,29 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "StandardÃ¥tkomst fÃ¶r denna applikation: skrivskyddad, eller lÃ¤s och skriv"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Avbryt"
 
 #. TRANS: Application access type
 #: lib/applicationlist.php:136
-#, fuzzy
 msgid "read-write"
-msgstr "LÃ¤s och skriv"
+msgstr "lÃ¤s och skriv"
 
 #. TRANS: Application access type
 #: lib/applicationlist.php:138
-#, fuzzy
 msgid "read-only"
-msgstr "Skrivskyddad"
+msgstr "skrivskyddad"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
 #: lib/applicationlist.php:144
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "GodkÃ¤nd %1$s - \"%2$s\" Ã¥tkomst."
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Ãterkalla"
@@ -5261,34 +5477,40 @@ msgstr "Kommando misslyckades"
 msgid "Notice with that id does not exist"
 msgstr "Notis med den ID:n finns inte"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "AnvÃ¤ndare har ingen sista notis"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "Kunde inte hitta en anvÃ¤ndare med smeknamnet %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "Kunde inte hitta en lokal anvÃ¤ndare med smeknamnet %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "TyvÃ¤rr, detta kommando Ã¤r inte implementerat Ã¤n."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Det verkar inte vara sÃ¤rskilt meningsfullt att knuffa dig sjÃ¤lv!"
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Knuff skickad till %s"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5299,57 +5521,55 @@ msgstr ""
 "Prenumeranter: %2$s\n"
 "Notiser: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "Notis markerad som favorit."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "Du Ã¤r redan en medlem i denna grupp"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "Kunde inte ansluta anvÃ¤ndare %s till groupp %s"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s gick med i grupp %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "Kunde inte ansluta anvÃ¤ndare %1$s till grupp %2$s."
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "Kunde inte ta bort anvÃ¤ndare %s frÃ¥n grupp %s"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s lÃ¤mnade grupp %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "FullstÃ¤ndigt namn: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Plats: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hemsida: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5358,139 +5578,145 @@ msgstr ""
 "%s Ã¤r en fjÃ¤rrprofil; du kan bara skicka direktmeddelanden till anvÃ¤ndare pÃ¥ "
 "samma server."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "Meddelande fÃ¶r lÃ¥ngt - maximum Ã¤r %d tecken, du skickade %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "Meddelande fÃ¶r lÃ¥ngt - maximum Ã¤r %1$d tecken, du skickade %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "Direktmeddelande till %s skickat"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "Fel vid sÃ¤ndning av direktmeddelande."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "Kan inte upprepa din egen notis"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "Redan upprepat denna notis"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "Notis fron %s upprepad"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "Fel vid upprepning av notis."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "Notis fÃ¶r lÃ¥ngt - maximum Ã¤r %d tecken, du skickade %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "Svar pÃ¥ %s skickat"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "Fel vid sparande av notis."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "Ange namnet pÃ¥ anvÃ¤ndaren att prenumerara pÃ¥"
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Kan inte prenumera pÃ¥ OMB-profiler via kommando."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "Prenumerar pÃ¥ %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "Ange namnet pÃ¥ anvÃ¤ndaren att avsluta prenumeration pÃ¥"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "Prenumeration hos %s avslutad"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "Kommando inte implementerat Ã¤n."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Notifikation av."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "Kan inte sÃ¤tta pÃ¥ notifikation."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Notifikation pÃ¥."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "Kan inte stÃ¤nga av notifikation."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "Inloggningskommando Ã¤r inaktiverat"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 "Denna lÃ¤nk Ã¤r endast anvÃ¤ndbar en gÃ¥ng, och gÃ¤ller bara i 2 minuter: %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "Prenumeration avslutad %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "Du prenumererar inte pÃ¥ nÃ¥gon."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du prenumererar pÃ¥ denna person:"
 msgstr[1] "Du prenumererar pÃ¥ dessa personer:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "Ingen prenumerar pÃ¥ dig."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Denna person prenumererar pÃ¥ dig:"
 msgstr[1] "Dessa personer prenumererar pÃ¥ dig:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "Du Ã¤r inte medlem i nÃ¥gra grupper."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du Ã¤r en medlem i denna grupp:"
 msgstr[1] "Du Ã¤r en medlem i dessa grupper:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6456,6 +6682,10 @@ msgstr "Inga \"return-to\"-argument."
 msgid "Repeat this notice?"
 msgstr "Upprepa denna notis?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ja"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "Upprepa denna notis"
@@ -6642,47 +6872,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "Moderator"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "ett par sekunder sedan"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "fÃ¶r nÃ¥n minut sedan"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fÃ¶r %d minuter sedan"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "fÃ¶r en timma sedan"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "fÃ¶r %d timmar sedan"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "fÃ¶r en dag sedan"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "fÃ¶r %d dagar sedan"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "fÃ¶r en mÃ¥nad sedan"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "fÃ¶r %d mÃ¥nader sedan"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "fÃ¶r ett Ã¥r sedan"
 
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index 1934cb51ad..bf599e41bc 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:22+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:49+0000\n"
 "Language-Team: Telugu\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: out-statusnet\n"
@@ -72,8 +72,13 @@ msgstr "à°®à±à°¸à°¿à°µà±à°¯à°¬à°¡à°¿à°à°¦à°¿"
 msgid "Save access settings"
 msgstr "à°à°à°¦à±à°¬à°¾à°à± à°à°®à°°à°¿à°à°²à°¨à± à°à°¦à±à°°à°ªà°°à°à±"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "à°à°¦à±à°°à°ªà°°à°à±"
@@ -103,7 +108,7 @@ msgstr "à°à°à±à°µà°à°à°¿ à°ªà±à°à± à°²à±à°¦à±."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "à°à°à±à°µà°à°à°¿ à°µà°¾à°¡à±à°à°°à°¿ à°²à±à°°à±."
@@ -336,7 +341,7 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr "à° à°¨à±à°à±à°¸à± à°à°ªà±à°ªà°à°¿à°à± à°®à± à°à°·à±à°à°¾à°à°¶à°."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "à°à°·à±à°à°¾à°à°¶à°¾à°¨à±à°¨à°¿ à°¸à±à°·à±à°à°¿à°à°à°²à±à°à°ªà±à°¯à°¾à°."
 
@@ -454,7 +459,7 @@ msgstr "à°à±à°à°ªà± à°¦à±à°°à°à°²à±à°¦à±."
 msgid "You are already a member of that group."
 msgstr "à°®à±à°°à± à°à°ªà±à°ªà°à°¿à°à± à° à°à±à°à°ªà±à°²à± à°¸à°à±à°¯à±à°²à±."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "à°¨à°¿à°°à±à°µà°¾à°¹à°à±à°²à± à° à°à±à°à°ªà± à°¨à±à°à°¡à°¿ à°®à°¿à°®à±à°®à°²à±à°¨à°¿ à°¨à°¿à°°à±à°§à°¿à°à°à°¾à°°à±."
 
@@ -506,17 +511,17 @@ msgid "Invalid token."
 msgstr "à°¤à°ªà±à°ªà±à°¡à± à°ªà°°à°¿à°®à°¾à°£à°."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -549,12 +554,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -811,27 +819,44 @@ msgstr ""
 "à°®à±à°°à± à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¨à°¿à°à°à°à°¾à°¨à± à°¨à°¿à°°à±à°§à°¿à°à°à°¾à°²à°¨à±à°à±à°à°à±à°¨à±à°¨à°¾à°°à°¾? à° à°¤à°°à±à°µà°¾à°¤, à°µà°¾à°°à± à°®à± à°¨à±à°à°¡à°¿ à°à°à°¦à°¾ à°µà°¿à°°à°®à°¿à°à°ªà°¬à°¡à°¤à°¾à°°à±, "
 "à°à°µà°¿à°·à±à°¯à°¤à±à°¤à±à°²à± à°®à±à°à± à°à°à°¦à°¾ à°à±à°°à°²à±à°°à±, à°®à°°à°¿à°¯à± à°µà°¾à°°à°¿ à°¨à±à°à°¡à°¿ @-à°¸à±à°ªà°à°¦à°¨à°²à°¨à°¿ à°®à±à°à± à°¤à±à°²à°¿à°¯à°à±à°¯à°®à±."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "à°à°¾à°¦à±"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¨à°¿à°°à±à°§à°¿à°à°à°à±"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "à°à°µà±à°¨à±"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¨à°¿à°°à±à°§à°¿à°à°à±"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "à°¨à°¿à°°à±à°§à°ªà± à°¸à°®à°¾à°à°¾à°°à°¾à°¨à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°à°¡à°à°²à± à°µà°¿à°«à°²à°®à°¯à±à°¯à°¾à°."
 
@@ -844,8 +869,8 @@ msgstr "à°¨à°¿à°°à±à°§à°ªà± à°¸à°®à°¾à°à°¾à°°à°¾à°¨à±à°¨à°¿ à°à°¦à±à°°à°ª
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "à°à°à±à°µà°à°à°¿ à°à±à°à°ªà± à°²à±à°¦à±."
 
@@ -906,16 +931,24 @@ msgstr "à°à±à°°à±à°¤à±à°¤à±à°²à°¿à°¯à°¨à°¿ à°à°¿à°°à±à°¨à°¾à°®à°¾ à°°à°
 msgid "That address has already been confirmed."
 msgstr "à° à°à°¿à°°à±à°¨à°¾à°®à°¾ à°à°ªà±à°ªà°à°¿à°à± à°¨à°¿à°°à±à°§à°¾à°°à°¿à°¤à°®à±à°à°¦à°¿."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¤à°¾à°à°¾à°à°°à°¿à°à°à°²à±à°à±à°¨à±à°¨à°¾à°."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "à°à°®à±à°¯à°¿à°²à± à°¨à°¿à°°à±à°§à°¾à°°à°£à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°²à±à°à±à°¨à±à°¨à°¾à°."
 
@@ -969,11 +1002,13 @@ msgstr ""
 "à°®à±à°°à± à°¨à°¿à°à°à°à°¾à°¨à± à° à°à°ªà°à°°à°£à°¾à°¨à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¾à°²à°¨à±à°à±à°à°à±à°¨à±à°¨à°¾à°°à°¾? à°à°¦à°¿ à° à°à°ªà°à°°à°£à° à°à±à°°à°¿à°à°à°¿ à°à±à°à°à±à°à°¾à°¨à°¿, à°ªà±à°°à°¸à±à°¤à±à°¤ "
 "à°µà°¾à°¡à±à°à°°à±à°² à°à°¨à±à°¸à°à°§à°¾à°¨à°¾à°²à°¤à± à°¸à°¹à°¾, à°¡à°¾à°à°¾à°¬à±à°¸à± à°¨à±à°à°¡à°¿ à°¤à±à°²à°à°¿à°¸à±à°¤à±à°à°¦à°¿."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "à° à°à°ªà°à°°à°£à°¾à°¨à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°à±"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "à° à°à°ªà°à°°à°£à°¾à°¨à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à±"
 
@@ -1006,11 +1041,13 @@ msgstr "à°¨à±à°à±à°¸à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à±"
 msgid "Are you sure you want to delete this notice?"
 msgstr "à°®à±à°°à± à°¨à°¿à°à°à°à°¾à°¨à± à° à°¨à±à°à±à°¸à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¾à°²à°¨à±à°à±à°à°à±à°¨à±à°¨à°¾à°°à°¾?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "à° à°¨à±à°à±à°¸à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°à±"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "à° à°¨à±à°à±à°¸à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à±"
 
@@ -1034,7 +1071,8 @@ msgstr ""
 "à°®à±à°°à± à°¨à°¿à°à°à°à°¾à°¨à± à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¾à°²à°¨à±à°à±à°à°à±à°¨à±à°¨à°¾à°°à°¾? à°à°¦à°¿ à° à°µà°¾à°¡à±à°à°°à°¿ à°à±à°à°à±à°à°¾à°¨à°¿ à°¡à°¾à°à°¾à°¬à±à°¸à± à°¨à±à°à°¡à°¿ à°¤à±à°²à°à°¿à°¸à±à°¤à±à°à°¦à°¿, "
 "à°µà±à°¨à°à±à°à°¿ à°¤à±à°²à±à°à±à°à°¡à°¾."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¤à±à°²à°à°¿à°à°à±"
 
@@ -1145,15 +1183,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "à°à°¦à±à°°à°ªà°°à°à±"
 
@@ -1281,31 +1317,43 @@ msgstr "à°®à°¾à°°à±à°ªà±à°°à±à°²à°¨à°¿ à°¸à±à°·à±à°à°¿à°à°à°²à±à°à°ª
 msgid "Options saved."
 msgstr "à°à°à°ªà°¿à°à°²à± à°à°¦à±à°°à°®à°¯à±à°¯à°¾à°¯à°¿."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "à°à°®à±à°¯à°¿à°²à± à°à°®à°°à°¿à°à°²à±"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "%%site.name%% à°¨à±à°à°¡à°¿ à°®à±à°à± à°à°²à°¾ à°®à±à°¯à°¿à°²à± à°µà°¸à±à°¤à±à°à°¤à± à°¸à°à°à°¾à°³à°¿à°à°à±à°à±à°à°¡à°¿."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "à°à°¿à°°à±à°¨à°¾à°®à°¾"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "à°ªà±à°°à°¸à±à°¤à±à°¤ à°¨à°¿à°°à±à°§à°¾à°°à°¿à°¤ à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "à°¤à±à°²à°à°¿à°à°à±"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1313,148 +1361,196 @@ msgstr ""
 "à° à°à°¿à°°à±à°¨à°¾à°®à°¾ à°¨à°¿à°°à±à°§à°¾à°°à°£à°à± à°µà±à°à°¿à°µà±à°¨à±à°¨à°¾à°. à°¤à°¦à±à°ªà°°à°¿ à°¸à±à°à°¨à°²à°¤à± à°à°¨à±à°¨ à°¸à°à°¦à±à°¶à°¾à°¨à°¿à°à± à°®à± à°à°¨à±âà°¬à°¾à°à±à°¸à±âà°²à± (à°¸à±à°ªà°¾à°®à± à°¬à°¾à°à±à°¸à±à°²à± à°à±à°¡à°¾!) "
 "à°à±à°¡à°à°¡à°¿."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "à°°à°¦à±à°¦à±à°à±à°¯à°¿"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾, \"username@example.org\" à°µà°²à±"
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "à°à±à°°à±à°à±"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "à°à±à°¤à±à°¤à°¦à°¿"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "à°à°à°¿à°°à±à°à±à°²à±"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "à°¨à±à°¨à± à°à°®à±à°¯à°¿à°²à± à°¦à±à°µà°¾à°°à°¾ à°¨à±à°à±à°¸à±à°²à± à°ªà°à°ªà°¾à°²à°¨à±à°à±à°à°à±à°¨à±à°¨à°¾à°¨à±."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "à°à°à°¿à°°à±à°à±à°²à± à°à°¦à±à°°à°®à°¯à±à°¯à°¾à°¯à°¿."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ à°²à±à°¦à±."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "à°¸à°°à±à°¨ à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ à°à°¾à°¦à±:"
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "à°à°¦à°¿ à°à°ªà±à°ªà°à°¿à°à± à°®à± à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "à° à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ à°à°ªà±à°ªà°à±à°à± à°à°¤à°° à°µà°¾à°¡à±à°à°°à°¿à°à°¿ à°¸à°à°¬à°à°§à°¿à°à°à°¿à°¨à°¦à°¿."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "à°¨à°¿à°°à±à°§à°¾à°°à°£ à°¸à°à°à±à°¤à°¾à°¨à±à°¨à°¿ à°à±à°°à±à°à°²à±à°à°ªà±à°¯à°¾à°."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "à°°à°¦à±à°¦à±à°à±à°¯à°¡à°¾à°¨à°¿à°à°¿ à°µà±à°à°¿à°µà±à°¨à±à°¨ à°¨à°¿à°°à±à°§à°¾à°°à°£à°²à±à°®à± à°²à±à°µà±."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "à° IM à°à°¿à°°à±à°¨à°¾à°®à°¾ à°¸à°°à±à°¨à°¦à°¿ à°à°¾à°¦à±."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "à°¨à°¿à°°à±à°§à°¾à°°à°£ à°°à°¦à±à°¦à°¯à°¿à°à°¦à°¿."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "à°à°¦à°¿ à°®à± à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ à°à°¾à°¦à±."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "à° à°à°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¾à°."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr ""
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr ""
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1640,15 +1736,17 @@ msgstr ""
 "à°¨à°¿à°à°à°à°¾à°¨à± à°µà°¾à°¡à±à°à°°à°¿ \"%1$s\"à°¨à°¿ \"%2$s\" à°à±à°à°ªà± à°¨à±à°à°¡à°¿ à°¨à°¿à°°à±à°§à°¿à°à°à°¾à°²à°¨à±à°à±à°à°à±à°¨à±à°¨à°¾à°°à°¾? à°µà°¾à°°à°¿à°¨à°¿ à°à±à°à°ªà± à°¨à±à°à°¡à°¿ "
 "à°¤à±à°²à°à°¿à°¸à±à°¤à°¾à°, à°à° à°à°µà°¿à°·à±à°¯à°¤à±à°¤à±à°²à± à°µà°¾à°°à± à°à±à°à°ªà±à°²à± à°ªà±à°°à°à±à°°à°¿à°à°à°²à±à°°à±, à°®à°°à°¿à°¯à± à°à±à°à°ªà±à°à°¿ à°à°à°¦à°¾à°à±à°°à°²à±à°°à±."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à° à°à±à°à°ªà± à°¨à±à°à°¡à°¿ à°¨à°¿à°°à±à°§à°¿à°à°à°à±"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "à° à°à±à°à°ªà±à°¨à±à°à°¡à°¿ à° à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¨à°¿à°°à±à°§à°¿à°à°à±"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1827,90 +1925,148 @@ msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°à±à°à°ªà± à°¨à±à°à°¡à°¿ à°¨à°¿à°°à±
 msgid "Error removing the block."
 msgstr "à°¨à°¿à°°à±à°§à°¾à°¨à±à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¡à°à°²à± à°ªà±à°°à°ªà°¾à°à±."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "IM à°à°®à°°à°¿à°à°²à±"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "IM à°à°à°¦à±à°¬à°¾à°à±à°²à± à°²à±à°¦à±."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "IM à°à°¿à°°à±à°¨à°¾à°®à°¾"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "à°ªà±à°°à°¸à±à°¤à±à°¤à° à°¨à°¿à°°à±à°§à°¾à°°à°¿à°à°à°¿à°¨ Jabber/GTalk à°à°¿à°°à±à°¨à°¾à°®à°¾"
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "IM à°à°¿à°°à±à°¨à°¾à°®à°¾"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "à°à°à°¿à°°à±à°à±à°²à±"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "à°à°à°¿à°°à±à°à±à°²à± à°à°¦à±à°°à°®à°¯à±à°¯à°¾à°¯à°¿."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "Jabber ID à°²à±à°¦à±."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr ""
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "à°¸à°°à±à°¨ Jabber à°à°¡à± à°à°¾à°¦à±"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "à° Jabber ID à°®à±à°à± à°à°ªà±à°ªà°à°¿à°à± à°à°à°¦à°¿"
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID à°à°ªà±à°ªà°à°¿à°à± à°µà±à°°à±à°à°°à°¿à°à°¿ à°à°à°¦à°¿."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "à° IM à°à°¿à°°à±à°¨à°¾à°®à°¾ à°¸à°°à±à°¨à°¦à°¿ à°à°¾à°¦à±."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "à°à°®à±à°¯à°¿à°²à± à°¨à°¿à°°à±à°§à°¾à°°à°£à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°²à±à°à±à°¨à±à°¨à°¾à°."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "à°¨à°¿à°°à±à°§à°¾à°°à°£ à°°à°¦à±à°¦à°¯à°¿à°à°¦à°¿."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "à°à°¦à°¿ à°®à± Jabber ID à°à°¾à°¦à±"
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "à° à°à°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¾à°."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1951,7 +2107,9 @@ msgstr "à°à±à°¤à±à°¤ à°µà°¾à°¡à±à°à°°à±à°²à°¨à°¿ à°à°¹à±à°µà°¾à°¨à°¿à°
 msgid "You are already subscribed to these users:"
 msgstr "à°®à±à°°à± à°à°ªà±à°ªà°à°¿à°à± à° à°µà°¾à°¡à±à°à°°à±à°²à°à± à°à°à°¦à°¾à°à±à°°à°¿ à°à°¨à±à°¨à°¾à°°à±:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2045,7 +2203,9 @@ msgstr "à°à±à°à°ªà±à°²à±à°²à± à°à±à°°à°¡à°¾à°¨à°¿à°à°¿ à°®à±à°°à± à°ª
 msgid "No nickname or ID."
 msgstr "à°ªà±à°°à± à°²à±à°¦à±."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s %2$s à°à±à°à°ªà±à°²à± à°à±à°°à°¾à°°à±"
@@ -2054,11 +2214,13 @@ msgstr "%1$s %2$s à°à±à°à°ªà±à°²à± à°à±à°°à°¾à°°à±"
 msgid "You must be logged in to leave a group."
 msgstr "à°à±à°à°ªà±à°¨à°¿ à°µà°¦à°¿à°²à°¿à°µà±à°³à±à°³à°¡à°¾à°¨à°¿à°à°¿ à°®à±à°°à± à°ªà±à°°à°µà±à°¶à°¿à°à°à°¿ à°à°à°¡à°¾à°²à°¿."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "à°®à±à°°à± à° à°à±à°à°ªà±à°²à± à°¸à°à±à°¯à±à°²à± à°à°¾à°¦à±."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%2$s à°à±à°à°ªà± à°¨à±à°à°¡à°¿ %1$s à°µà±à°¦à±à°²à°¿à°à°¾à°°à±"
@@ -2168,12 +2330,12 @@ msgstr "à°à±à°¤à±à°¤ à°à±à°à°ªà±à°¨à°¿ à°¸à±à°·à±à°à°¿à°à°¡à°¾à°¨à°¿
 msgid "New message"
 msgstr "à°à±à°¤à±à°¤ à°¸à°à°¦à±à°¶à°"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "à° à°µà°¾à°¡à±à°à°°à°¿à°à°¿ à°®à±à°°à± à°¸à°à°¦à±à°¶à°¾à°¨à±à°¨à°¿ à°ªà°à°ªà°¿à°à°à°²à±à°°à±."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "à°µà°¿à°·à°¯à° à°²à±à°¦à±!"
 
@@ -2181,7 +2343,7 @@ msgstr "à°µà°¿à°·à°¯à° à°²à±à°¦à±!"
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "à°®à±à°à± à°®à±à°°à± à°¸à°à°¦à±à°¶à°¾à°¨à±à°¨à°¿ à°ªà°à°ªà±à°à±à°à°à°¡à°¿; à°¦à°¾à°¨à°¿ à°¬à°¦à±à°²à± à°®à±à°²à± à°®à±à°°à± à°®à±à°²à±à°²à°à°¾ à°à±à°ªà±à°ªà±à°à±à°à°¡à°¿."
@@ -2439,7 +2601,7 @@ msgid "6 or more characters"
 msgstr "6 à°²à±à°¦à°¾ à°à°à°¤à°à°à°à± à°à°à±à°à±à°µ à°à°à±à°·à°°à°¾à°²à±"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "à°¨à°¿à°°à±à°¥à°¾à°°à°¿à°à°à±"
 
@@ -3785,97 +3947,158 @@ msgstr "à°¸à±à°à±-à°µà°¾à°°à± à°¨à±à°à±à°¸à± à°ªà°¾à° à±à°¯à° (255 à°
 msgid "Save site notice"
 msgstr "à°¸à±à°à± à°à°®à°¨à°¿à°à°¨à°¿ à°à°¦à±à°°à°ªà°°à°à±"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "SMS à°à°®à°°à°¿à°à°²à±"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "à°¹à±à°®à± à°ªà±à°à± URL à°¸à°°à±à°¨à°¦à°¿ à°à°¾à°¦à±."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM à°à°¿à°°à±à°¨à°¾à°®à°¾"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "à° à°«à±à°¨à± à°¨à°à°¬à°°à± à°¯à±à°à±à° à°¨à°¿à°°à±à°§à°¾à°°à°£à°à± à°µà±à°à°¿à°µà±à°à°¦à°¿."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "à°¨à°¿à°°à±à°§à°¾à°°à°£ à°¸à°à°à±à°¤à°"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "à°¨à°¿à°°à±à°¥à°¾à°°à°¿à°à°à±"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "à°à°à°¿à°°à±à°à±à°²à±"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "à°à°à°¿à°°à±à°à±à°²à± à°à°¦à±à°°à°®à°¯à±à°¯à°¾à°¯à°¿."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "à°«à±à°¨à± à°¨à±à°à°¬à°°à± à°²à±à°¦à±."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "à°à°¦à°¿ à°à°ªà±à°ªà°à°¿à°à± à°®à± à°«à±à°¨à± à°¨à±à°à°¬à°°à±."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "à° à°«à±à°¨à± à°¨à°à°¬à°°à± à°à°ªà±à°ªà°à°¿à°à± à°µà±à°°à± à°µà°¾à°¡à±à°à°°à°¿à°à°¿ à°à±à°à°¦à°¿à°¨à°¦à°¿."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr "à° à°¨à°¿à°°à±à°§à°¾à°°à°£à°¾ à°¸à°à°à±à°¤à° à°®à±à°¦à°¿ à°à°¾à°¦à±!"
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "à°à°¦à°¿ à°¤à°ªà±à°ªà±à°¡à± à°¨à°¿à°°à±à°§à°¾à°°à°£ à°¸à°à°à±à°¯."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "à°¨à°¿à°°à±à°§à°¾à°°à°£ à°°à°¦à±à°¦à°¯à°¿à°à°¦à°¿."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "à°à°¦à°¿ à°®à± à°«à±à°¨à± à°¨à°à°¬à°°à± à°à°¾à°¦à±."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "à° à°à°¿à°°à±à°¨à°¾à°®à°¾à°¨à°¿ à°¤à±à°²à°à°¿à°à°à°¾à°."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr ""
 
@@ -5052,10 +5275,8 @@ msgstr "à°à°¦à°µà°¡à°-à°µà±à°°à°¾à°¯à°¡à°"
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "à°°à°¦à±à°¦à±à°à±à°¯à°¿"
 
@@ -5135,35 +5356,41 @@ msgstr "à°à°¦à±à°¶à° à°µà°¿à°«à°²à°®à±à°à°¦à°¿"
 msgid "Notice with that id does not exist"
 msgstr "à° à°à°®à±à°¯à°¿à°²à± à°à°¿à°°à±à°¨à°¾à°®à°¾ à°²à±à°¦à°¾ à°µà°¾à°¡à±à°à°°à°¿à°ªà±à°°à±à°¤à± à°µà°¾à°¡à±à°à°°à±à°²à±à°µà°°à± à°²à±à°°à±."
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 #, fuzzy
 msgid "User has no last notice"
 msgstr "à°µà°¾à°¡à±à°à°°à°¿à°à°¿ à°ªà±à°°à±à°«à±à°²à± à°²à±à°¦à±."
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¤à°¾à°à°¾à°à°°à°¿à°à°à°²à±à°à±à°¨à±à°¨à°¾à°."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "à°µà°¾à°¡à±à°à°°à°¿à°¨à°¿ à°¤à°¾à°à°¾à°à°°à°¿à°à°à°²à±à°à±à°¨à±à°¨à°¾à°."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "à°à±à°·à°®à°¿à°à°à°à°¡à°¿, à° à°à°¦à±à°¶à° à°à°à°à°¾ à°à°®à°²à±à°ªà°°à°à°¬à°¡à°²à±à°¦à±."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "%sà°à°¿ à°¸à±à°ªà°à°¦à°¨à°²à±"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5174,197 +5401,201 @@ msgstr ""
 "à°à°à°¦à°¾à°¦à°¾à°°à±à°²à±: %2$s\n"
 "à°¨à±à°à±à°¸à±à°²à±: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "à°®à±à°°à± à°à°ªà±à°ªà°à°¿à°à± à° à°à±à°à°ªà±à°²à± à°¸à°à±à°¯à±à°²à±"
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
-msgstr "à°µà°¾à°¡à±à°à°°à°¿ %sà°¨à°¿ %s à°à±à°à°ªà±à°²à± à°à±à°°à±à°à°²à±à°à°ªà±à°¯à°¾à°"
-
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%s %s à°à±à°à°ªà±à°²à± à°à±à°°à°¾à°°à±"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
+msgstr "à°µà°¾à°¡à±à°à°°à°¿ %1$sà°¨à°¿ %2$s à°à±à°à°ªà±à°²à± à°à±à°°à±à°à°²à±à°à°ªà±à°¯à°¾à°"
 
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "à°µà°¾à°¡à±à°à°°à°¿ %sà°¨à°¿ %s à°à±à°à°ªà± à°¨à±à°à°¡à°¿ à°¤à±à°²à°à°¿à°à°à°²à±à°à°ªà±à°¯à°¾à°"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%2$s à°à±à°à°ªà± à°¨à±à°à°¡à°¿ %1$s à°µà±à°¦à±à°²à°¿à°à°¾à°°à±"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "à°ªà±à°°à±à°¤à°¿à°ªà±à°°à±: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "à°ªà±à°°à°¾à°à°¤à°: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "à°¹à±à°à°ªà±à°à±: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "à°à±à°°à°¿à°à°à°¿: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "à°¨à±à°à°¿à°¸à± à°à°¾à°²à°¾ à°ªà±à°¡à°µà±à°à°¾ à°à°à°¦à°¿ - %d à°à°à±à°·à°°à°¾à°²à± à°à°°à°¿à°·à±à° à°, à°®à±à°°à± %d à°ªà°à°ªà°¿à°à°à°¾à°°à±"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr "à°¨à±à°à°¿à°¸à± à°à°¾à°²à°¾ à°ªà±à°¡à°µà±à°à°¾ à°à°à°¦à°¿ - %1$d à°à°à±à°·à°°à°¾à°²à± à°à°°à°¿à°·à±à° à°, à°®à±à°°à± %2$d à°ªà°à°ªà°¿à°à°à°¾à°°à±."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "%sà°à°¿ à°¨à±à°°à± à°¸à°à°¦à±à°¶à°¾à°¨à±à°¨à°¿ à°ªà°à°ªà°¿à°à°à°¾à°"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "à°®à± à°¨à±à°à°¿à°¸à±à°¨à°¿ à°®à±à°°à± à°ªà±à°¨à°°à°¾à°µà±à°¤à°¿à°à°à°²à±à°°à±"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "à°à°ªà±à°ªà°à°¿à°à± à° à°¨à±à°à±à°¸à±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±à°¤à°¿à°à°à°¾à°°à±"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "à°¸à°à°¦à±à°¶à°¾à°²à±"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "à°¸à°à°¦à±à°¶à°¾à°¨à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°à°¡à°à°²à± à°ªà±à°°à°ªà°¾à°à±."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "à°¨à±à°à°¿à°¸à± à°à°¾à°²à°¾ à°ªà±à°¡à°µà±à°à°¾ à°à°à°¦à°¿ - %d à°à°à±à°·à°°à°¾à°²à± à°à°°à°¿à°·à±à° à°, à°®à±à°°à± %d à°ªà°à°ªà°¿à°à°à°¾à°°à±"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "%sà°à°¿ à°¸à±à°ªà°à°¦à°¨à°²à±"
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "à°¸à°à°¦à±à°¶à°¾à°¨à±à°¨à°¿ à°à°¦à±à°°à°ªà°°à°à°¡à°à°²à± à°ªà±à°°à°ªà°¾à°à±."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "à°à°µà°°à°¿à°à°¿ à°à°à°¦à°¾ à°à±à°°à°¾à°²à°¨à±à°à±à°à°à±à°¨à±à°¨à°¾à°°à± à° à°µà°¾à°¡à±à°à°°à°¿ à°ªà±à°°à± à°¤à±à°²à°¿à°¯à°à±à°¯à°à°¡à°¿"
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "%sà°à°¿ à°à°à°¦à°¾ à°à±à°°à°¾à°°à±"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "à°à°µà°°à°¿ à°¨à±à°à°¡à°¿ à°à°à°¦à°¾ à°µà°¿à°°à°®à°¿à°à°à°¾à°²à°¨à±à°à±à°à°à±à°¨à±à°¨à°¾à°°à± à° à°µà°¾à°¡à±à°à°°à°¿ à°ªà±à°°à± à°¤à±à°²à°¿à°¯à°à±à°¯à°à°¡à°¿"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "%s à°¨à±à°à°¡à°¿ à°à°à°¦à°¾ à°µà°¿à°°à°®à°¿à°à°à°¾à°°à±"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr "à° à°²à°à°à±à°¨à°¿ à°à°à± à°¸à°¾à°°à°¿ à°à°ªà°¯à±à°à°¿à°à°à°à°²à°°à±, à°®à°°à°¿à°¯à± à°à°¦à°¿ à°ªà°¨à°¿à°à±à°¸à±à°¦à°¿ 2 à°¨à°¿à°®à°¿à°·à°¾à°²à± à°®à°¾à°¤à±à°°à°®à±: %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "%s à°¨à±à°à°¡à°¿ à°à°à°¦à°¾ à°µà°¿à°°à°®à°¿à°à°à°¾à°°à±"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "à°®à±à°°à± à°à°µà°°à°¿à°à± à°à°à°¦à°¾à°à±à°°à°²à±à°¦à±."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "%sà°à°¿ à°¸à±à°ªà°à°¦à°¨à°²à±"
 msgstr[1] "%sà°à°¿ à°¸à±à°ªà°à°¦à°¨à°²à±"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "à°®à±à°à± à°à°à°¦à°¾à°¦à°¾à°°à±à°²à± à°à°µà°°à± à°²à±à°°à±."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "%sà°à°¿ à°¸à±à°ªà°à°¦à°¨à°²à±"
 msgstr[1] "%sà°à°¿ à°¸à±à°ªà°à°¦à°¨à°²à±"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "à°®à±à°°à± à° à°à±à°à°ªà±à°²à±à°¨à± à°¸à°à±à°¯à±à°²à± à°à°¾à°¦à±."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "à°®à±à°°à± à°à°ªà±à°ªà°à°¿à°à± à°²à±à°¨à°¿à°à°¿ à°ªà±à°°à°µà±à°¶à°¿à°à°à°¾à°°à±!"
 msgstr[1] "à°®à±à°°à± à°à°ªà±à°ªà°à°¿à°à± à°²à±à°¨à°¿à°à°¿ à°ªà±à°°à°µà±à°¶à°¿à°à°à°¾à°°à±!"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6227,6 +6458,10 @@ msgstr "à°à°à±à°µà°à°à°¿ à°ªà°¤à±à°°à°®à±à°®à± à°²à±à°¦à±."
 msgid "Repeat this notice?"
 msgstr "à° à°¨à±à°à±à°¸à±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±à°¤à°¿à°à°à°¾à°²à°¾?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "à°à°µà±à°¨à±"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "à° à°¨à±à°à±à°¸à±à°¨à°¿ à°ªà±à°¨à°°à°¾à°µà±à°¤à°¿à°à°à±"
@@ -6418,47 +6653,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "à°¸à°®à°¨à±à°µà°¯à°à°°à±à°¤"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "à°à±à°¨à±à°¨à°¿ à°à±à°·à°£à°¾à°² à°à±à°°à°¿à°¤à°"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "à° à°¨à°¿à°®à°¿à°·à° à°à±à°°à°¿à°¤à°"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d à°¨à°¿à°®à°¿à°·à°¾à°² à°à±à°°à°¿à°¤à°"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "à°à° à°à°à° à°à±à°°à°¿à°¤à°"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d à°à°à°à°² à°à±à°°à°¿à°¤à°"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "à° à°°à±à°à± à°à±à°°à°¿à°¤à°"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "%d à°°à±à°à±à°² à°à±à°°à°¿à°¤à°"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "à° à°¨à±à°² à°à±à°°à°¿à°¤à°"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "%d à°¨à±à°²à°² à°à±à°°à°¿à°¤à°"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "à°à° à°¸à°à°µà°¤à±à°¸à°°à° à°à±à°°à°¿à°¤à°"
 
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index d52d304de9..e5b1c00fff 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:26+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:52+0000\n"
 "Language-Team: Turkish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: out-statusnet\n"
@@ -78,8 +78,13 @@ msgstr "BÃ¶yle bir kullanÄ±cÄ± yok."
 msgid "Save access settings"
 msgstr "Ayarlar"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -111,7 +116,7 @@ msgstr "BÃ¶yle bir durum mesajÄ± yok."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "BÃ¶yle bir kullanÄ±cÄ± yok."
@@ -348,7 +353,7 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr "Bu zaten sizin Jabber ID'niz."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr ""
 
@@ -472,7 +477,7 @@ msgstr "Ä°stek bulunamadÄ±!"
 msgid "You are already a member of that group."
 msgstr "Zaten giriÅ yapmÄ±Å durumdasÄ±znÄ±z!"
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -525,17 +530,17 @@ msgid "Invalid token."
 msgstr "GeÃ§ersiz bÃ¼yÃ¼klÃ¼k."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -569,12 +574,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "BeklenmeÄen form girdisi."
 
@@ -840,29 +848,45 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
-msgstr ""
+msgstr "Durum mesajlarÄ±"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 #, fuzzy
 msgid "Do not block this user"
 msgstr "BÃ¶yle bir kullanÄ±cÄ± yok."
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 #, fuzzy
 msgid "Block this user"
 msgstr "BÃ¶yle bir kullanÄ±cÄ± yok."
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr ""
 
@@ -875,8 +899,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 #, fuzzy
 msgid "No such group."
 msgstr "BÃ¶yle bir durum mesajÄ± yok."
@@ -938,16 +962,24 @@ msgstr "TanÄ±nmayan adres tÃ¼rÃ¼ %s"
 msgid "That address has already been confirmed."
 msgstr "O adres daha Ã¶nce onaylanmÄ±Å."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "KullanÄ±cÄ± gÃ¼ncellenemedi."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "Eposta onayÄ± silinemedi."
 
@@ -1005,12 +1037,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "BÃ¶yle bir durum mesajÄ± yok."
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "Kendinizi ve ilgi alanlarÄ±nÄ±zÄ± 140 karakter ile anlatÄ±n"
@@ -1044,12 +1078,14 @@ msgstr ""
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "BÃ¶yle bir durum mesajÄ± yok."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr ""
 
@@ -1073,7 +1109,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 #, fuzzy
 msgid "Delete this user"
 msgstr "BÃ¶yle bir kullanÄ±cÄ± yok."
@@ -1195,15 +1232,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "Kaydet"
 
@@ -1340,180 +1375,239 @@ msgstr "Avatar bilgisi kaydedilemedi"
 msgid "Options saved."
 msgstr "Ayarlar kaydedildi."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "Profil ayarlarÄ±"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Adres"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Eposta adresi onayÄ±"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr ""
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "KaldÄ±r"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Ä°ptal et"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Eposta adresi onayÄ±"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "Ekle"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "Tercihler"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr ""
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "Tercihler kaydedildi."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr ""
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "GeÃ§ersiz bir eposta adresi."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr ""
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr ""
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "Onay kodu eklenemedi."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Ä°ptal etmek iÃ§in beklenen onay yok."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "YanlÄ±Å IM adresi."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Onaylama iptal edildi."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr ""
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "Bu adres kaldÄ±rÄ±lmÄ±ÅtÄ±."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr ""
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr ""
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1711,17 +1805,19 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 #, fuzzy
 msgid "Do not block this user from this group"
 msgstr "Sunucuya yÃ¶nlendirme yapÄ±lamadÄ±: %s"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 #, fuzzy
 msgid "Block this user from this group"
 msgstr "BÃ¶yle bir kullanÄ±cÄ± yok."
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1902,12 +1998,16 @@ msgstr "KullanÄ±cÄ±nÄ±n profili yok."
 msgid "Error removing the block."
 msgstr "KullanÄ±cÄ±yÄ± kaydetmede hata oluÅtu."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "IM AyarlarÄ±"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1916,16 +2016,26 @@ msgstr ""
 "Jabber/GTalk kullanarak durum mesaji gÃnderip alabilirsiniz. IM adres "
 "ayarlarinizi aÅaÄÄ±da yapÄ±n."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 #, fuzzy
 msgid "IM is not available."
 msgstr "Bu sayfa kabul ettiÄiniz ortam tÃ¼rÃ¼nde kullanÄ±labilir deÄil"
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "IM adresi"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "OnaylanmÄ±Å Jabber/Gtalk adresi."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1934,12 +2044,9 @@ msgstr ""
 "Bu adresten onay bekleniyor. Jabber/Google Talk hesabÄ±nÄ±zÄ± ayrÄ±ntÄ±lÄ± bilgi "
 "iÃ§eren mesajÄ± almak iÃ§in kontrol edin. (%s'u arkadaÅ listenize eklediniz mi?)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "IM adresi"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1948,44 +2055,66 @@ msgstr ""
 "Jabber veya Gtalk adresi: \"KullaniciAdi@example.org\" gibi. Ãncelikle %s, "
 "IM istemcisi veya Gtalk arkadaÅlar listenize eklenmiÅ olmalÄ±dÄ±r."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "Tercihler"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "Durum mesajlarÄ±nÄ± Jabber/GTalk Ã¼zerinden gÃ¶nder."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 "Jabber/GTalk durum mesajim deÄiÅtiÄinde nedurum.com'da durumumu gÃ¼ncelle"
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "Tercihler kaydedildi."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "JabberID yok."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Jabber iÅlemlerinde bir hata oluÅtu."
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "GeÃ§ersiz bir Jabber ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Bu zaten sizin Jabber ID'niz."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID baÅka bir kullanÄ±cÄ±ya ait."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1994,10 +2123,35 @@ msgstr ""
 "EklemiÅ olduÄunuz IM adresine bir onay kodu gÃ¶nderildi. %s tarafÄ±ndan size "
 "mesaj yollanabilmesi iÃ§in onaylamanÄ±z gerekmektedir."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "YanlÄ±Å IM adresi."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "Eposta onayÄ± silinemedi."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Onaylama iptal edildi."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Bu sizin Jabber ID'niz deÄil."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "Bu adres kaldÄ±rÄ±lmÄ±ÅtÄ±."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2038,7 +2192,9 @@ msgstr ""
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2133,7 +2289,9 @@ msgstr ""
 msgid "No nickname or ID."
 msgstr "Takma ad yok"
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
@@ -2142,12 +2300,14 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "Bize o profili yollamadÄ±nÄ±z"
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s'in %2$s'deki durum mesajlarÄ± "
@@ -2262,12 +2422,12 @@ msgstr ""
 msgid "New message"
 msgstr ""
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr ""
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "Ä°Ã§erik yok!"
 
@@ -2275,7 +2435,7 @@ msgstr "Ä°Ã§erik yok!"
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2536,7 +2696,7 @@ msgid "6 or more characters"
 msgstr "6 veya daha fazla karakter"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "Onayla"
 
@@ -3893,98 +4053,159 @@ msgstr ""
 msgid "Save site notice"
 msgstr "Yeni durum mesajÄ±"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "IM AyarlarÄ±"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Bu sayfa kabul ettiÄiniz ortam tÃ¼rÃ¼nde kullanÄ±labilir deÄil"
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM adresi"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr ""
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "Onayla"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "Tercihler"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "Tercihler kaydedildi."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr ""
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr ""
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr "O onay kodu sizin iÃ§in deÄil!"
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Onaylama iptal edildi."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr ""
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Bu adres kaldÄ±rÄ±lmÄ±ÅtÄ±."
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr ""
 
@@ -5208,10 +5429,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Ä°ptal et"
 
@@ -5288,35 +5507,41 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 #, fuzzy
 msgid "User has no last notice"
 msgstr "KullanÄ±cÄ±nÄ±n profili yok."
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "KullanÄ±cÄ± gÃ¼ncellenemedi."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "KullanÄ±cÄ± gÃ¼ncellenemedi."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "%s iÃ§in cevaplar"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5324,201 +5549,205 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Zaten giriÅ yapmÄ±Å durumdasÄ±znÄ±z!"
 
-#: lib/command.php:331
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
 msgstr "Sunucuya yÃ¶nlendirme yapÄ±lamadÄ±: %s"
 
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
 #, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%1$s'in %2$s'deki durum mesajlarÄ± "
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
 msgstr "OpenID formu yaratÄ±lamadÄ±: %s"
 
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "%1$s'in %2$s'deki durum mesajlarÄ± "
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, fuzzy, php-format
 msgid "Fullname: %s"
 msgstr "Tam Ä°sim"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "EÄer lisansÄ± kabul etmezseniz kayÄ±t olamazsÄ±nÄ±z."
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "Zaten giriÅ yapmÄ±Å durumdasÄ±znÄ±z!"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "Durum mesajlarÄ±"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "Durum mesajÄ±nÄ± kaydederken hata oluÅtu."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "%s iÃ§in cevaplar"
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "Durum mesajÄ±nÄ± kaydederken hata oluÅtu."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Bize o profili yollamadÄ±nÄ±z"
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "AboneliÄi sonlandÄ±r"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Bize o profili yollamadÄ±nÄ±z"
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Bize o profili yollamadÄ±nÄ±z"
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "Uzaktan abonelik"
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Uzaktan abonelik"
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Bize o profili yollamadÄ±nÄ±z"
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Bize o profili yollamadÄ±nÄ±z"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6378,6 +6607,10 @@ msgstr "BÃ¶yle bir belge yok."
 msgid "Repeat this notice?"
 msgstr "BÃ¶yle bir durum mesajÄ± yok."
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr ""
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6575,47 +6808,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "birkaÃ§ saniye Ã¶nce"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "yaklaÅÄ±k bir dakika Ã¶nce"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "yaklaÅÄ±k %d dakika Ã¶nce"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "yaklaÅÄ±k bir saat Ã¶nce"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "yaklaÅÄ±k %d saat Ã¶nce"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "yaklaÅÄ±k bir gÃ¼n Ã¶nce"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "yaklaÅÄ±k %d gÃ¼n Ã¶nce"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "yaklaÅÄ±k bir ay Ã¶nce"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "yaklaÅÄ±k %d ay Ã¶nce"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "yaklaÅÄ±k bir yÄ±l Ã¶nce"
 
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index 6df5416970..f9b74e02d5 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:29+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:55+0000\n"
 "Language-Team: Ukrainian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: out-statusnet\n"
@@ -77,8 +77,13 @@ msgstr "ÐÐ°ÐºÑÐ¸ÑÐ¾"
 msgid "Save access settings"
 msgstr "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¸ Ð´Ð¾ÑÑÑÐ¿Ñ"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "ÐÐ±ÐµÑÐµÐ³ÑÐ¸"
@@ -108,7 +113,7 @@ msgstr "ÐÐµÐ¼Ð°Ñ ÑÐ°ÐºÐ¾Ñ ÑÑÐ¾ÑÑÐ½ÐºÐ¸."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ð¢Ð°ÐºÐ¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð½ÐµÐ¼Ð°Ñ."
@@ -347,7 +352,7 @@ msgstr "ÐÐ¾Ð´Ð½Ð¸Ñ ÑÑÐ°ÑÑÑÑÐ² Ð· ÑÐ°ÐºÐ¸Ð¼ ID."
 msgid "This status is already a favorite."
 msgstr "Ð¦ÐµÐ¹ ÑÑÐ°ÑÑÑ Ð²Ð¶Ðµ Ñ Ð¾Ð±ÑÐ°Ð½Ð¸Ð¼."
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð¿Ð¾Ð·Ð½Ð°ÑÐ¸ÑÐ¸ ÑÐº Ð¾Ð±ÑÐ°Ð½Ðµ."
 
@@ -465,7 +470,7 @@ msgstr "ÐÑÑÐ¿Ñ Ð½Ðµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾."
 msgid "You are already a member of that group."
 msgstr "ÐÐ¸ Ð²Ð¶Ðµ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÑÑÑ Ð³ÑÑÐ¿Ð¸."
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr "ÐÐ´Ð¼ÑÐ½ ÑÑÑÑ Ð³ÑÑÐ¿Ð¸ Ð·Ð°Ð±Ð»Ð¾ÐºÑÐ²Ð°Ð² ÐÐ°ÑÑ Ð¿ÑÐ¸ÑÑÑÐ½ÑÑÑÑ Ð² Ð½ÑÐ¹."
 
@@ -516,17 +521,17 @@ msgid "Invalid token."
 msgstr "ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ ÑÐ¾ÐºÐµÐ½."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -560,12 +565,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr "Ð¢Ð¾ÐºÐµÐ½ Ð·Ð°Ð¿Ð¸ÑÑ %s Ð±ÑÐ»Ð¾ ÑÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾ Ñ Ð²ÑÐ´ÑÐ¸Ð»ÐµÐ½Ð¾."
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "ÐÐµÑÐ¿Ð¾Ð´ÑÐ²Ð°Ð½Ðµ Ð¿ÑÐµÐ´ÑÑÐ°Ð²Ð»ÐµÐ½Ð½Ñ ÑÐ¾ÑÐ¼Ð¸."
 
@@ -826,27 +834,44 @@ msgstr ""
 "Ð²ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ð¾ Ð²ÑÐ´ ÐÐ°Ñ, Ð²ÑÐ½ Ð½Ðµ Ð·Ð¼Ð¾Ð¶Ðµ Ð¿ÑÐ´Ð¿Ð¸ÑÐ¸ÑÐ°ÑÑÑ Ð´Ð¾ ÐÐ°Ñ Ñ Ð¼Ð°Ð¹Ð±ÑÑÐ½ÑÐ¾Ð¼Ñ Ñ ÐÐ¸ "
 "Ð±ÑÐ»ÑÑÐµ Ð½Ðµ Ð¾ÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ¸Ð¼ÐµÑÐµ Ð¶Ð¾Ð´Ð½Ð¸Ñ Ð´Ð¾Ð¿Ð¸ÑÑÐ² Ð²ÑÐ´ Ð½ÑÐ¾Ð³Ð¾."
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "ÐÑ"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 msgid "Do not block this user"
 msgstr "ÐÐµ Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÑÑÐ¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "Ð¢Ð°Ðº"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
 msgstr "ÐÐ»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "ÐÐ±ÐµÑÐµÐ¶ÐµÐ½Ð½Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð¿ÑÐ¾ Ð±Ð»Ð¾ÐºÑÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑÑÐ¸Ð»Ð¾ÑÑ Ð½ÐµÐ²Ð´Ð°ÑÐµÑ."
 
@@ -859,8 +884,8 @@ msgstr "ÐÐ±ÐµÑÐµÐ¶ÐµÐ½Ð½Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ Ð¿ÑÐ¾ Ð±Ð»Ð¾ÐºÑÐ²Ð°Ð½Ð½Ñ Ð·
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "Ð¢Ð°ÐºÐ¾Ñ Ð³ÑÑÐ¿Ð¸ Ð½ÐµÐ¼Ð°Ñ."
 
@@ -919,16 +944,24 @@ msgstr "ÐÐµÐ²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¸Ð¹ ÑÐ¸Ð¿ Ð°Ð´ÑÐµÑÐ¸ %s."
 msgid "That address has already been confirmed."
 msgstr "Ð¦Ñ Ð°Ð´ÑÐµÑÑ Ð²Ð¶Ðµ Ð±ÑÐ»Ð¾ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð¾."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¾Ð½Ð¾Ð²Ð¸ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¾Ñ Ð°Ð´ÑÐµÑÐ¸."
 
@@ -983,11 +1016,13 @@ msgstr ""
 "ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ ÑÑÐ¾ÑÐ¾Ð²Ð½Ð¾ Ð½ÑÐ¾Ð³Ð¾, Ð²ÐºÐ»ÑÑÐ½Ð¾ ÑÐ· Ð´Ð°Ð½Ð¸Ð¼Ð¸ Ð¿ÑÐ¾ Ð¿ÑÐ´âÑÐ´Ð½Ð°Ð½Ð¸Ñ Ð´Ð¾ ÑÑÐ¾Ð³Ð¾ "
 "Ð´Ð¾Ð´Ð°ÑÐºÑ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑÐ²."
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 msgid "Do not delete this application"
 msgstr "ÐÐµ Ð²Ð¸Ð´Ð°Ð»ÑÑÐ¸ Ð´Ð¾Ð´Ð°ÑÐ¾Ðº"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 msgid "Delete this application"
 msgstr "ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð¾Ð´Ð°ÑÐ¾Ðº"
 
@@ -1020,11 +1055,13 @@ msgstr "ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð¾Ð¿Ð¸Ñ"
 msgid "Are you sure you want to delete this notice?"
 msgstr "ÐÐ¸ Ð²Ð¿ÐµÐ²Ð½ÐµÐ½Ð½Ñ, ÑÐ¾ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ ÑÐµÐ¹ Ð´Ð¾Ð¿Ð¸Ñ?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 msgid "Do not delete this notice"
 msgstr "ÐÐµ Ð²Ð¸Ð´Ð°Ð»ÑÑÐ¸ ÑÐµÐ¹ Ð´Ð¾Ð¿Ð¸Ñ"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr "ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð´Ð¾Ð¿Ð¸Ñ"
 
@@ -1048,7 +1085,8 @@ msgstr ""
 "ÐÐ¿ÐµÐ²Ð½ÐµÐ½Ñ, ÑÐ¾ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ ÑÑÐ¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°? Ð£ÑÑ Ð´Ð°Ð½Ñ Ð±ÑÐ´Ðµ Ð·Ð½Ð¸ÑÐµÐ½Ð¾ Ð±ÐµÐ· "
 "Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ÑÑÑ Ð²ÑÐ´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ."
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
 msgstr "ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸ ÑÑÐ¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°"
 
@@ -1161,15 +1199,13 @@ msgid "Reset back to default"
 msgstr "ÐÐ¾Ð²ÐµÑÐ½ÑÑÐ¸ÑÑ Ð´Ð¾ Ð¿Ð¾ÑÐ°ÑÐºÐ¾Ð²Ð¸Ñ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ñ"
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ÐÐ±ÐµÑÐµÐ³ÑÐ¸"
 
@@ -1295,31 +1331,43 @@ msgstr "ÐÐµÐ¼Ð¾Ð¶Ð½Ð° Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐ¸ÑÐ¸ Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ñ ÑÐ¼ÐµÐ½Ð°."
 msgid "Options saved."
 msgstr "ÐÐ¿ÑÑÑ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð¾."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 msgid "Email settings"
 msgstr "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð¿Ð¾ÑÑÐ¸"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "ÐÐ°Ð·Ð½Ð°ÑÑÐµ, ÑÐº ÑÐ°Ð¼Ðµ ÐÐ¸ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð¾ÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ¸ Ð»Ð¸ÑÑÐ¸ Ð· %%site.name%%."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "ÐÐ´ÑÐµÑÐ°"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+msgid "Email address"
+msgstr "ÐÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð° Ð°Ð´ÑÐµÑÐ°"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "ÐÐ¾ÑÐ¾ÑÐ½Ð° Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð° Ð¿Ð¾ÑÑÐ¾Ð²Ð° Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1327,106 +1375,141 @@ msgstr ""
 "ÐÑÑÐºÑÐ²Ð°Ð½Ð½Ñ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ ÑÑÑÑ Ð°Ð´ÑÐµÑÐ¸. ÐÐµÑÐµÐ²ÑÑÑÐµ Ð²ÑÑÐ´Ð½Ñ Ð¿Ð¾ÑÑÑ (Ñ ÑÐµÐºÑ Ð·Ñ "
 "ÑÐ¿Ð°Ð¼Ð¾Ð¼ ÑÐ°ÐºÐ¾Ð¶!), ÑÐ°Ð¼ Ð¼Ð°Ñ Ð±ÑÑÐ¸ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· Ð¿Ð¾Ð´Ð°Ð»ÑÑÐ¸Ð¼Ð¸ ÑÐ½ÑÑÑÑÐºÑÑÑÐ¼Ð¸."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸"
 
-#: actions/emailsettings.php:121
-msgid "Email address"
-msgstr "ÐÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð° Ð°Ð´ÑÐµÑÐ°"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "ÐÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð° Ð°Ð´ÑÐµÑÐ°, Ð½Ð° Ð·ÑÐ°Ð·Ð¾Ðº \"UserName@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "ÐÐ¾Ð´Ð°ÑÐ¸"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "ÐÑÑÐ´Ð½Ð° Ð¿Ð¾ÑÑÐ°"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°Ð¹ÑÐµ Ð´Ð¾Ð¿Ð¸ÑÐ¸ Ð½Ð° ÑÑ Ð°Ð´ÑÐµÑÑ Ñ ÑÑ Ð±ÑÐ´Ðµ Ð¾Ð¿ÑÐ±Ð»ÑÐºÐ¾Ð²Ð°Ð½Ð¾ Ð½Ð° ÑÐ°Ð¹ÑÑ."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð½Ð¾Ð²Ñ Ð°Ð´ÑÐµÑÑ Ð´Ð»Ñ Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ; Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ ÑÑÐ°ÑÑ."
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "ÐÐ¾Ð²Ðµ"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "ÐÑÐµÑÐµÑÐµÐ½ÑÑÑ"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "ÐÐ¾ÑÐ²Ð´Ð¾Ð¼Ð»ÑÑÐ¸ Ð¼ÐµÐ½Ðµ Ð¿Ð¾ÑÑÐ¾Ñ Ð¿ÑÐ¾ Ð½Ð¾Ð²Ñ Ð¿ÑÐ´Ð¿Ð¸ÑÐºÐ¸."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ Ð¼ÐµÐ½Ñ Ð»Ð¸ÑÑÐ°, ÐºÐ¾Ð»Ð¸ ÑÑÐ¾ÑÑ Ð´Ð¾Ð´Ð°Ñ Ð¼ÑÐ¹ Ð´Ð¾Ð¿Ð¸Ñ Ð´Ð¾ ÑÐ¿Ð¸ÑÐºÑ Ð¾Ð±ÑÐ°Ð½Ð¸Ñ."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ Ð¼ÐµÐ½Ñ Ð»Ð¸ÑÑÐ°, ÐºÐ¾Ð»Ð¸ ÑÑÐ¾ÑÑ Ð¼Ð°Ñ Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ðµ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ Ð¼ÐµÐ½Ðµ."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ Ð¼ÐµÐ½Ñ Ð»Ð¸ÑÑÐ°, ÐºÐ¾Ð»Ð¸ Ð½Ð° Ð¼ÑÐ¹ Ð´Ð¾Ð¿Ð¸Ñ Ð·âÑÐ²Ð»ÑÑÑÑÑÑ \"@-Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´Ñ\"."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸ÑÐ¸ Ð´ÑÑÐ·ÑÐ¼ Â«ÑÐ¾Ð·ÑÑÐ¾Ð²ÑÐ°ÑÐ¸Â» Ð¼ÐµÐ½Ðµ, Ð½Ð°Ð´ÑÑÐ»Ð°Ð²ÑÐ¸ Ð¼ÐµÐ½Ñ Ð»Ð¸ÑÑÐ°."
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "Ð¯ ÑÐ¾ÑÑ Ð½Ð°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ Ð´Ð¾Ð¿Ð¸ÑÐ¸ Ð¿Ð¾ÑÑÐ¾Ñ."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "ÐÐ¾Ð·Ð½Ð°ÑÐ°ÑÐ¸ Ð¼ÑÑÐºÐ¾Ñ MicroID Ð¼Ð¾Ñ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ñ Ð°Ð´ÑÐµÑÑ."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "ÐÑÐµÑÐµÑÐµÐ½ÑÑÑ Ð·Ð±ÐµÑÐµÐ¶Ð½Ð¾."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "ÐÑÐµÑÐµÑÐµÐ½ÑÑÑ Ð´Ð¸Ð·Ð°Ð¹Ð½Ñ Ð·Ð±ÐµÑÐµÐ¶Ð½Ð¾."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "ÐÐµÐ¼Ð°Ñ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð¾Ñ Ð°Ð´ÑÐµÑÐ¸."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð¿Ð¾Ð»Ð°Ð³Ð¾Ð´Ð¸ÑÐ¸ ÑÑ Ð¿Ð¾ÑÑÐ¾Ð²Ñ Ð°Ð´ÑÐµÑÑ"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Ð¦Ðµ Ð½ÐµÐ´ÑÐ¹ÑÐ½Ð° ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð° Ð°Ð´ÑÐµÑÐ°."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "Ð¦Ðµ Ñ Ñ ÐÐ°ÑÐ¾Ñ Ð°Ð´ÑÐµÑÐ¾Ñ."
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "Ð¦Ñ ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ð° Ð°Ð´ÑÐµÑÐ° Ð½Ð°Ð»ÐµÐ¶Ð¸ÑÑ ÑÐ½ÑÐ¾Ð¼Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑ."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð´Ð¾Ð´Ð°ÑÐ¸ ÐºÐ¾Ð´ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1435,43 +1518,56 @@ msgstr ""
 "ÐÐµÑÐµÐ²ÑÑÑÐµ Ð²ÑÑÐ´Ð½Ñ Ð¿Ð¾ÑÑÑ (Ñ ÑÐµÐºÑ Ð·Ñ ÑÐ¿Ð°Ð¼Ð¾Ð¼ ÑÐ°ÐºÐ¾Ð¶!), ÑÐ°Ð¼ Ð¼Ð°Ñ Ð±ÑÑÐ¸ ÐºÐ¾Ð´ ÑÐ° "
 "Ð¿Ð¾Ð´Ð°Ð»ÑÑÑ ÑÐ½ÑÑÑÑÐºÑÑÑ."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "ÐÐµ Ð¾ÑÑÐºÑÑÑÑÑÑ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð´Ð»Ñ ÑÐºÐ°ÑÑÐ²Ð°Ð½Ð½Ñ."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Ð¦Ðµ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð° Ð°Ð´ÑÐµÑÐ° IM."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ ÑÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "Ð¦Ðµ Ð½Ðµ Ñ ÐÐ°ÑÐ¾Ñ Ð°Ð´ÑÐµÑÐ¾Ñ."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "ÐÐ´ÑÐµÑÑ Ð±ÑÐ»Ð¾ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "ÐÐµÐ¼Ð°Ñ Ð°Ð´ÑÐµÑÐ¸ Ð´Ð»Ñ Ð²ÑÑÐ´Ð½Ð¾Ñ Ð¿Ð¾ÑÑÐ¸."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¾Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð·Ð°Ð¿Ð¸Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "ÐÐ´ÑÐµÑÑ Ð²ÑÑÐ´Ð½Ð¾Ñ Ð¿Ð¾ÑÑÐ¸ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "ÐÐ¾Ð²Ñ Ð°Ð´ÑÐµÑÑ Ð´Ð»Ñ Ð²ÑÑÐ´Ð½Ð¸Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ Ð´Ð¾Ð´Ð°Ð½Ð¾."
 
@@ -1660,15 +1756,17 @@ msgstr ""
 "Ð¿Ð¾Ð·Ð±Ð°Ð²Ð»ÐµÐ½Ð¾ ÑÐ»ÐµÐ½ÑÑÐ²Ð° Ð² Ð³ÑÑÐ¿Ñ, Ð²ÑÐ½ Ð½Ðµ Ð·Ð¼Ð¾Ð¶Ðµ ÑÑÐ´Ð¸ Ð¿Ð¸ÑÐ°ÑÐ¸, Ñ Ð½Ðµ Ð·Ð¼Ð¾Ð¶Ðµ Ð²ÑÑÑÐ¿Ð¸ÑÐ¸ "
 "Ð´Ð¾ Ð³ÑÑÐ¿Ð¸ Ð·Ð½Ð¾Ð²."
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 msgid "Do not block this user from this group"
 msgstr "ÐÐµ Ð±Ð»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð² Ð³ÑÑÐ¿Ñ"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "ÐÐ»Ð¾ÐºÑÐ²Ð°ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° ÑÑÑÑ Ð³ÑÑÐ¿Ð¸"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr "ÐÐ¸Ð½Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð±Ð»Ð¾ÐºÑÐ²Ð°Ð½Ð½Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð² ÑÑÐ¹ Ð³ÑÑÐ¿Ñ."
 
@@ -1852,11 +1950,15 @@ msgstr "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð½Ðµ Ð±Ð»Ð¾ÐºÐ¾Ð²Ð°Ð½Ð¾."
 msgid "Error removing the block."
 msgstr "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ ÑÐ¾Ð·Ð±Ð»Ð¾ÐºÑÐ²Ð°Ð½Ð½Ñ."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 msgid "IM settings"
 msgstr "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ ÐÐ"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1865,15 +1967,24 @@ msgstr ""
 "ÐÐ¸ Ð¼Ð¾Ð¶ÐµÑÐµ Ð½Ð°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ ÑÐ° Ð¾ÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ¸ Ð´Ð¾Ð¿Ð¸ÑÐ¸ ÑÐµÑÐµÐ· Jabber/GTalk [ÑÐ»ÑÐ¶Ð±Ñ Ð¼Ð¸ÑÑÑÐ²Ð¸Ñ "
 "Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ](%%doc.im%%). ÐÐºÐ°Ð¶Ð¸ÑÑ ÑÐ²Ð¾Ñ Ð°Ð´ÑÐµÑÑ Ñ Ð½Ð°Ð»Ð°ÑÑÑÐ¹ÑÐµ Ð¾Ð¿ÑÑÑ Ð½Ð¸Ð¶ÑÐµ."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 msgid "IM is not available."
 msgstr "ÐÐ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¸Ð¹"
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+msgid "IM address"
+msgstr "ÐÐ-Ð°Ð´ÑÐµÑÐ°"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ÐÐ¾ÑÐ¾ÑÐ½Ð° Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð° Ð°Ð´ÑÐµÑÐ° Jabber/GTalk."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1883,11 +1994,9 @@ msgstr ""
 "ÑÑÐ´Ð¸ Ð¼Ð°Ñ Ð½Ð°Ð´ÑÐ¹ÑÐ¸ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð· Ð¿Ð¾Ð´Ð°Ð»ÑÑÐ¸Ð¼Ð¸ ÑÐ½ÑÑÑÑÐºÑÑÑÐ¼Ð¸. (ÐÐ¸ Ð´Ð¾Ð´Ð°Ð»Ð¸ %s Ð´Ð¾ "
 "ÐÐ°ÑÐ¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÑ ÐºÐ¾Ð½ÑÐ°ÐºÑÑÐ²?)"
 
-#: actions/imsettings.php:124
-msgid "IM address"
-msgstr "ÐÐ-Ð°Ð´ÑÐµÑÐ°"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1897,45 +2006,67 @@ msgstr ""
 "Ð¿ÐµÑÐµÐºÐ¾Ð½Ð°Ð¹ÑÐµÑÑ, ÑÐ¾ Ð´Ð¾Ð´Ð°Ð»Ð¸ %s Ð´Ð¾ ÑÐ¿Ð¸ÑÐºÑ ÐºÐ¾Ð½ÑÐ°ÐºÑÑÐ² Ð² ÑÐ²Ð¾ÑÐ¼Ñ IM-ÐºÐ»ÑÑÐ½ÑÑ Ð°Ð±Ð¾ Ð² "
 "GTalk."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "ÐÑÐµÑÐµÑÐµÐ½ÑÑÑ"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "ÐÐ¾Ð²ÑÐ´Ð¾Ð¼Ð»ÑÑÐ¸ Ð¼ÐµÐ½Ðµ ÑÐµÑÐµÐ· Jabber/GTalk."
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "ÐÐ°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ Ð´Ð¾Ð¿Ð¸ÑÐ¸ Ð½Ð° ÑÐ°Ð¹Ñ, ÐºÐ¾Ð»Ð¸ Ð¼ÑÐ¹ ÑÑÐ°ÑÑÑ Jabber/GTalk Ð·Ð¼ÑÐ½ÑÑÑÑÑÑ."
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "ÐÐ°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ ÑÐ°ÐºÐ¾Ð¶ Ð¼ÐµÐ½Ñ Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´Ñ ÑÐµÑÐµÐ· Jabber/GTalk Ð²ÑÐ´ Ð»ÑÐ´ÐµÐ¹, Ð´Ð¾ ÑÐºÐ¸Ñ Ñ Ð½Ðµ "
 "Ð¿ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "ÐÐ¾Ð·Ð½Ð°ÑÐ°ÑÐ¸ Ð¼ÑÑÐºÐ¾Ñ MicroID Ð¼Ð¾Ñ Ð°Ð´ÑÐµÑÑ Jabber/GTalk."
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "ÐÑÐµÑÐµÑÐµÐ½ÑÑÑ Ð·Ð±ÐµÑÐµÐ¶Ð½Ð¾."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "ÐÐµÐ¼Ð°Ñ Jabber ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð¿Ð¾Ð»Ð°Ð³Ð¾Ð´Ð¸ÑÐ¸ ÑÐµÐ¹ Jabber ID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Ð¦Ðµ Ð½ÐµÐ´ÑÐ¹ÑÐ½Ð¸Ð¹ Jabber ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "Ð¦Ðµ Ñ Ñ ÐÐ°Ñ Jabber ID."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID Ð²Ð¶Ðµ Ð½Ð°Ð»ÐµÐ¶Ð¸ÑÑ ÑÐ½ÑÐ¾Ð¼Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑ."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -1944,10 +2075,35 @@ msgstr ""
 "ÐÐ¾Ð´ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð±ÑÐ² Ð²ÑÐ´Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð½Ð° Ð°Ð´ÑÐµÑÑ IM, ÑÐºÑ ÐÐ¸ Ð´Ð¾Ð´Ð°Ð»Ð¸. ÐÐ¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ "
 "Ð·Ð°ÑÐ²ÐµÐ´Ð¸ÑÐ¸ %s Ð´Ð»Ñ Ð²ÑÐ´Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð½Ñ Ð²Ð°Ð¼ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Ð¦Ðµ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð° Ð°Ð´ÑÐµÑÐ° IM."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð¿Ð¾ÑÑÐ¾Ð²Ð¾Ñ Ð°Ð´ÑÐµÑÐ¸."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ ÑÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "Ð¦Ðµ Ð½Ðµ ÐÐ°Ñ Jabber ID."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "ÐÐ´ÑÐµÑÑ Ð±ÑÐ»Ð¾ Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾."
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -1989,7 +2145,9 @@ msgstr "ÐÐ°Ð¿ÑÐ¾ÑÐ¸ÑÐ¸ Ð½Ð¾Ð²Ð¸Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑÐ²"
 msgid "You are already subscribed to these users:"
 msgstr "ÐÐ¸ Ð²Ð¶Ðµ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ñ Ð´Ð¾ ÑÐ¸Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑÐ²:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2114,7 +2272,9 @@ msgstr "ÐÐ¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ ÑÐ¿Ð¾ÑÐ°ÑÐºÑ ÑÐ²ÑÐ¹ÑÐ¸ Ð½Ð° ÑÐ°Ð¹Ñ, Ð°Ð±Ð¸
 msgid "No nickname or ID."
 msgstr "ÐÐµÐ¼Ð°Ñ ÑÐ¼ÐµÐ½Ñ Ð°Ð±Ð¾ ÐÐ."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s Ð¿ÑÐ¸ÑÐ´Ð½Ð°Ð²ÑÑ Ð´Ð¾ Ð³ÑÑÐ¿Ð¸ %2$s"
@@ -2123,11 +2283,13 @@ msgstr "%1$s Ð¿ÑÐ¸ÑÐ´Ð½Ð°Ð²ÑÑ Ð´Ð¾ Ð³ÑÑÐ¿Ð¸ %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "ÐÐ¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ ÑÐ¿Ð¾ÑÐ°ÑÐºÑ ÑÐ²ÑÐ¹ÑÐ¸ Ð½Ð° ÑÐ°Ð¹Ñ, Ð°Ð±Ð¸ Ð·Ð°Ð»Ð¸ÑÐ¸ÑÐ¸ Ð³ÑÑÐ¿Ñ."
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr "ÐÐ¸ Ð½Ðµ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÑÑÑ Ð³ÑÑÐ¿Ð¸."
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s Ð·Ð°Ð»Ð¸ÑÐ¸Ð² Ð³ÑÑÐ¿Ñ %2$s"
@@ -2239,12 +2401,12 @@ msgstr "Ð¡ÐºÐ¾ÑÐ¸ÑÑÐ°Ð¹ÑÐµÑÑ ÑÑÑÑ ÑÐ¾ÑÐ¼Ð¾Ñ Ð´Ð»Ñ ÑÑÐ²Ð¾ÑÐµÐ½Ð½
 msgid "New message"
 msgstr "ÐÐ¾Ð²Ðµ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "ÐÐ¸ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑÐµ Ð½Ð°Ð´ÑÑÐ»Ð°ÑÐ¸ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÑÑÐ¾Ð¼Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐµÐ²Ñ."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "ÐÐµÐ¼Ð°Ñ Ð·Ð¼ÑÑÑÑ!"
 
@@ -2252,7 +2414,7 @@ msgstr "ÐÐµÐ¼Ð°Ñ Ð·Ð¼ÑÑÑÑ!"
 msgid "No recipient specified."
 msgstr "ÐÐ¾Ð´Ð½Ð¾Ð³Ð¾ Ð¾ÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ° Ð½Ðµ Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð¾."
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2511,7 +2673,7 @@ msgid "6 or more characters"
 msgstr "6 Ð°Ð±Ð¾ Ð±ÑÐ»ÑÑÐµ Ð·Ð½Ð°ÐºÑÐ²"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¸ÑÐ¸"
 
@@ -3901,44 +4063,74 @@ msgstr "Ð¢ÐµÐºÑÑ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÑÐ°Ð¹ÑÑ (255 ÑÐ¸Ð¼Ð²Ð¾Ð»ÑÐ² Ð¼
 msgid "Save site notice"
 msgstr "ÐÐ±ÐµÑÐµÐ³ÑÐ¸ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ ÑÐ°Ð¹ÑÑ"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 msgid "SMS settings"
 msgstr "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð¡ÐÐ¡"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "ÐÐ¸ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¾ÑÑÐ¸Ð¼ÑÐ²Ð°ÑÐ¸ Ð¡ÐÐ¡ ÑÐµÑÐµÐ· ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ñ Ð¿Ð¾ÑÑÑ Ð²ÑÐ´ %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 msgid "SMS is not available."
 msgstr "Ð¡ÐÐ¡ Ð½ÐµÐ´Ð¾ÑÑÑÐ¿Ð½Ð¾."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "ÐÐ-Ð°Ð´ÑÐµÑÐ°"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "ÐÐ¾ÑÐ¾ÑÐ½Ð¸Ð¹ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð¸Ð¹ ÑÐµÐ»ÐµÑÐ¾Ð½Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ."
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "ÐÑÑÐºÑÐ²Ð°Ð½Ð½Ñ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ ÑÐµÐ»ÐµÑÐ¾Ð½Ð½Ð¾Ð³Ð¾ Ð½Ð¾Ð¼ÐµÑÐ°."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "ÐÐ¾Ð´ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ"
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "ÐÐ²ÐµÐ´ÑÑÑ ÐºÐ¾Ð´, ÑÐºÐ¸Ð¹ ÐÐ¸ Ð¾ÑÑÐ¸Ð¼Ð°Ð»Ð¸ ÑÐµÐ»ÐµÑÐ¾Ð½Ð¾Ð¼."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¸ÑÐ¸"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr "Ð¢ÐµÐ»ÐµÑÐ¾Ð½Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ"
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Ð¢ÐµÐ»ÐµÑÐ¾Ð½Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ ÑÐ° ÑÐµÐ³ÑÐ¾Ð½Ð°Ð»ÑÐ½Ð¸Ð¹ ÐºÐ¾Ð´, Ð½ÑÑÐºÐ¾Ñ Ð¿ÑÐ½ÐºÑÑÐ°ÑÑÑ ÑÐ¸ ÑÐ½ÑÐµÑÐ²Ð°Ð»ÑÐ²"
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "ÐÑÐµÑÐµÑÐµÐ½ÑÑÑ"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -3946,23 +4138,34 @@ msgstr ""
 "ÐÐ¾Ð²ÑÐ´Ð¾Ð¼Ð»ÑÑÐ¸ Ð¼ÐµÐ½Ðµ Ð·Ð° Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ Ð¡ÐÐ¡; Ð¯ ÑÐ¾Ð·ÑÐ¼ÑÑ, ÑÐ¾, Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾, Ð¿Ð¾Ð½ÐµÑÑ Ð½Ð°Ð´Ð¼ÑÑÐ½Ñ "
 "Ð²Ð¸ÑÑÐ°ÑÐ¸ Ð²ÑÐ´ Ð¼Ð¾Ð³Ð¾ Ð¼Ð¾Ð±ÑÐ»ÑÐ½Ð¾Ð³Ð¾ Ð¾Ð¿ÐµÑÐ°ÑÐ¾ÑÐ°."
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "ÐÑÐµÑÐµÑÐµÐ½ÑÑÑ Ð·Ð±ÐµÑÐµÐ¶Ð½Ð¾."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "ÐÐµÐ¼Ð°Ñ ÑÐµÐ»ÐµÑÐ¾Ð½Ð½Ð¾Ð³Ð¾ Ð½Ð¾Ð¼ÐµÑÐ°."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "ÐÐ¿ÐµÑÐ°ÑÐ¾ÑÐ° Ð½Ðµ Ð¾Ð±ÑÐ°Ð½Ð¾."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "Ð¦Ðµ Ñ Ñ ÐÐ°Ñ ÑÐµÐ»ÐµÑÐ¾Ð½Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "Ð¦ÐµÐ¹ ÑÐµÐ»ÐµÑÐ¾Ð½Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ Ð½Ð°Ð»ÐµÐ¶Ð¸ÑÑ ÑÐ½ÑÐ¾Ð¼Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÑ."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -3970,23 +4173,42 @@ msgstr ""
 "ÐÐ¾Ð´ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ Ð±ÑÐ² Ð²ÑÐ´Ð¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ð¹ Ð½Ð° ÑÐµÐ»ÐµÑÐ¾Ð½Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ, ÑÐºÐ¸Ð¹ ÐÐ¸ Ð´Ð¾Ð´Ð°Ð»Ð¸. "
 "ÐÐµÑÐµÐ²ÑÑÑÐµ Ð²ÑÑÐ´Ð½Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ, ÑÐ°Ð¼ Ð¼Ð°Ñ Ð±ÑÑÐ¸ ÐºÐ¾Ð´ ÑÐ° Ð¿Ð¾Ð´Ð°Ð»ÑÑÑ ÑÐ½ÑÑÑÑÐºÑÑÑ."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "Ð¦Ðµ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ¾Ð²Ð¸Ð¹ ÐºÐ¾Ð´ Ð¿ÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "ÐÑÐ´ÑÐ²ÐµÑÐ´Ð¶ÐµÐ½Ð½Ñ ÑÐºÐ°ÑÐ¾Ð²Ð°Ð½Ð¾."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "Ð¦Ðµ Ð½Ðµ ÐÐ°Ñ ÑÐµÐ»ÐµÑÐ¾Ð½Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Ð¢ÐµÐ»ÐµÑÐ¾Ð½Ð½Ð¸Ð¹ Ð½Ð¾Ð¼ÐµÑ"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr "ÐÐ¾Ð±ÑÐ»ÑÐ½Ð¸Ð¹ Ð¾Ð¿ÐµÑÐ°ÑÐ¾Ñ"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "ÐÐ±ÐµÑÑÑÑ Ð¾Ð¿ÐµÑÐ°ÑÐ¾ÑÐ°"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -3996,7 +4218,8 @@ msgstr ""
 "Ð½Ð°Ð´ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¡ÐÐ¡ ÑÐµÑÐµÐ· ÐµÐ»ÐµÐºÑÑÐ¾Ð½Ð½Ñ Ð¿Ð¾ÑÑÑ, Ð°Ð»Ðµ Ð²ÑÐ½ ÑÑÑ Ð½Ðµ Ð²ÐºÐ°Ð·Ð°Ð½Ð¸Ð¹, Ð½Ð°Ð¿Ð¸ÑÑÑÑ Ð½Ð°Ð¼ "
 "Ñ Ð¼Ð¸ Ð²Ð½ÐµÑÐµÐ¼Ð¾ Ð¹Ð¾Ð³Ð¾ Ð´Ð¾ ÑÐ¿Ð¸ÑÐºÑ."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "ÐÐ¾Ð´ Ð½Ðµ Ð²Ð²ÐµÐ´ÐµÐ½Ð¾"
 
@@ -5192,10 +5415,8 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 "ÐÐ¾Ð·Ð²ÑÐ» Ð·Ð° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼ Ð´Ð»Ñ ÑÑÐ¾Ð³Ð¾ Ð´Ð¾Ð´Ð°ÑÐºÑ: Ð»Ð¸ÑÐµ ÑÐ¸ÑÐ°Ð½Ð½Ñ Ð°Ð±Ð¾ ÑÐ¸ÑÐ°ÑÐ¸-Ð¿Ð¸ÑÐ°ÑÐ¸"
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸"
 
@@ -5271,34 +5492,40 @@ msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ Ð½Ðµ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð¾"
 msgid "Notice with that id does not exist"
 msgstr "Ð¢Ð°ÐºÐ¾Ð³Ð¾ Ð´Ð¾Ð¿Ð¸ÑÑ Ð½Ðµ ÑÑÐ½ÑÑ"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "ÐÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ Ð½Ðµ Ð¼Ð°Ñ Ð¾ÑÑÐ°Ð½Ð½ÑÐ¾Ð³Ð¾ Ð´Ð¾Ð¿Ð¸ÑÑ"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð½Ð°Ð¹ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð· ÑÐ¼ÐµÐ½ÐµÐ¼ %s"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð·Ð½Ð°Ð¹ÑÐ¸ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° Ð· ÑÐ¼ÐµÐ½ÐµÐ¼ %s"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "ÐÐ°ÑÑÐ¹ÑÐµ, Ð°Ð»Ðµ Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ÑÐµ Ð½Ðµ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾."
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "ÐÐ°Ð´Ð°ÑÐ¼Ð¾, ÐºÐ¾ÑÐ¸ÑÑÑ Ð²ÑÐ´ Â«ÑÐ¾Ð·ÑÑÐ¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÂ» ÑÐ°Ð¼Ð¾Ð³Ð¾ ÑÐµÐ±Ðµ Ð½ÐµÐ±Ð°Ð³Ð°ÑÐ¾, ÑÐ¸ Ð½Ðµ ÑÐ°Ðº?!"
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr "Ð¡Ð¿ÑÐ¾Ð±Ñ Â«ÑÐ¾Ð·ÑÑÐ¾Ð²ÑÐ°ÑÐ¸Â» %s Ð·Ð°ÑÐ°ÑÐ¾Ð²Ð°Ð½Ð¾"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5309,57 +5536,55 @@ msgstr ""
 "ÐÑÐ´Ð¿Ð¸ÑÑÐ¸ÐºÐ¸: %2$s\n"
 "ÐÐ¾Ð¿Ð¸ÑÐ¸: %3$s"
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "ÐÐ¾Ð¿Ð¸Ñ Ð¿Ð¾Ð·Ð½Ð°ÑÐµÐ½Ð¾ ÑÐº Ð¾Ð±ÑÐ°Ð½Ð¸Ð¹."
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "ÐÐ¸ Ð²Ð¶Ðµ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÑÑÑ Ð³ÑÑÐ¿Ð¸."
 
-#: lib/command.php:331
-#, php-format
-msgid "Could not join user %s to group %s"
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
+#, fuzzy, php-format
+msgid "Could not join user %1$s to group %2$s"
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð´Ð¾Ð»ÑÑÐ¸ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° %1$s Ð´Ð¾ Ð³ÑÑÐ¿Ð¸ %2$s."
 
-#: lib/command.php:336
-#, php-format
-msgid "%s joined group %s"
-msgstr "%1$s Ð¿ÑÐ¸ÑÐ´Ð½Ð°Ð²ÑÑ Ð´Ð¾ Ð³ÑÑÐ¿Ð¸ %2$s"
-
-#: lib/command.php:373
-#, php-format
-msgid "Could not remove user %s to group %s"
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
+#, fuzzy, php-format
+msgid "Could not remove user %s from group %s"
 msgstr "ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ° %1$s Ð· Ð³ÑÑÐ¿Ð¸ %2$s."
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%1$s Ð·Ð°Ð»Ð¸ÑÐ¸Ð² Ð³ÑÑÐ¿Ñ %2$s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "ÐÐ¾Ð²Ð½Ðµ ÑÐ¼âÑ: %s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "Ð Ð¾Ð·ÑÐ°ÑÑÐ²Ð°Ð½Ð½Ñ: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "ÐÐµÐ±-ÑÑÐ¾ÑÑÐ½ÐºÐ°: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "ÐÑÐ¾ Ð¼ÐµÐ½Ðµ: %s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5368,142 +5593,149 @@ msgstr ""
 "%s â ÑÐµ Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¸Ð¹ Ð¿ÑÐ¾ÑÑÐ»Ñ; ÐÐ¸ Ð¼Ð¾Ð¶ÐµÑÐµ Ð½Ð°Ð´ÑÐ¸Ð»Ð°ÑÐ¸ Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ñ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð»Ð¸ÑÐµ "
 "ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°Ð¼ Ð¾Ð´Ð½Ð¾Ð³Ð¾ Ð· Ð²Ð°Ð¼Ð¸ ÑÐµÑÐ²ÑÑÑ."
 
-#: lib/command.php:450
-#, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
-msgstr "ÐÐ¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´ÑÐ¾ Ð´Ð¾Ð²Ð³Ðµ â Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼ %d Ð·Ð½Ð°ÐºÑÐ², Ð° Ð²Ð¸ Ð½Ð°Ð´ÑÐ¸Ð»Ð°ÑÑÐµ %d"
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
+#, fuzzy, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgstr ""
+"ÐÐ¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð½Ð°Ð´ÑÐ¾ Ð´Ð¾Ð²Ð³Ðµ â Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼ %1$d ÑÐ¸Ð¼Ð²Ð¾Ð»ÑÐ², Ð° ÐÐ¸ Ð½Ð°Ð´ÑÐ¸Ð»Ð°ÑÑÐµ %2$d."
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "ÐÑÑÐ¼Ðµ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ Ð´Ð»Ñ %s Ð½Ð°Ð´ÑÑÐ»Ð°Ð½Ð¾."
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð²ÑÐ´Ð¿ÑÐ°Ð²ÑÑ Ð¿ÑÑÐ¼Ð¾Ð³Ð¾ Ð¿Ð¾Ð²ÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ð½Ñ."
 
-#: lib/command.php:490
+#: lib/command.php:514
 msgid "Cannot repeat your own notice"
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ñ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐ¸ ÐÐ°Ñ Ð²Ð»Ð°ÑÐ½Ð¸Ð¹ Ð´Ð¾Ð¿Ð¸Ñ"
 
-#: lib/command.php:495
+#: lib/command.php:519
 msgid "Already repeated that notice"
 msgstr "Ð¦ÐµÐ¹ Ð´Ð¾Ð¿Ð¸Ñ Ð²Ð¶Ðµ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸Ð»Ð¸"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, php-format
 msgid "Notice from %s repeated"
 msgstr "ÐÐ¾Ð¿Ð¸Ñ %s Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸Ð»Ð¸"
 
-#: lib/command.php:505
+#: lib/command.php:531
 msgid "Error repeating notice."
 msgstr "ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾Ð²ÑÐ¾ÑÐµÐ½Ð½Ñ Ð´Ð¾Ð¿Ð¸ÑÑ."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "ÐÐ¾Ð¿Ð¸Ñ Ð½Ð°Ð´ÑÐ¾ Ð´Ð¾Ð²Ð³Ð¸Ð¹ â Ð¼Ð°ÐºÑÐ¸Ð¼ÑÐ¼ %d Ð·Ð½Ð°ÐºÑÐ², Ð° Ð²Ð¸ Ð½Ð°Ð´ÑÐ¸Ð»Ð°ÑÑÐµ %d"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, php-format
 msgid "Reply to %s sent"
 msgstr "ÐÑÐ´Ð¿Ð¾Ð²ÑÐ´Ñ Ð´Ð¾ %s Ð½Ð°Ð´ÑÑÐ»Ð°Ð½Ð¾"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "ÐÑÐ¾Ð±Ð»ÐµÐ¼Ð° Ð¿ÑÐ¸ Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð½Ñ Ð´Ð¾Ð¿Ð¸ÑÑ."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "ÐÐ°Ð·Ð½Ð°ÑÑÐµ ÑÐ¼âÑ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°, Ð´Ð¾ ÑÐºÐ¾Ð³Ð¾ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°ÑÐ¸ÑÑ"
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ñ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°ÑÐ¸ÑÑ Ð´Ð¾  Ð¿ÑÐ¾ÑÑÐ»Ñ OMB Ð·Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¾Ñ."
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "ÐÑÐ´Ð¿Ð¸ÑÐ°Ð½Ð¾ Ð´Ð¾ %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "ÐÐ°Ð·Ð½Ð°ÑÑÐµ ÑÐ¼âÑ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°, Ð²ÑÐ´ ÑÐºÐ¾Ð³Ð¾ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð²ÑÐ´Ð¿Ð¸ÑÐ°ÑÐ¸ÑÑ"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "ÐÑÐ´Ð¿Ð¸ÑÐ°Ð½Ð¾ Ð²ÑÐ´ %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "ÐÐ¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ ÑÐµ Ð½Ðµ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾."
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "Ð¡Ð¿Ð¾Ð²ÑÑÐµÐ½Ð½Ñ Ð²Ð¸Ð¼ÐºÐ½ÑÑÐ¾."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸Ð¼ÐºÐ½ÑÑÐ¸ ÑÐ¿Ð¾Ð²ÑÑÐµÐ½Ð½Ñ."
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "Ð¡Ð¿Ð¾Ð²ÑÑÐµÐ½Ð½Ñ ÑÐ²ÑÐ¼ÐºÐ½ÑÑÐ¾."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "ÐÐµ Ð¼Ð¾Ð¶Ð½Ð° ÑÐ²ÑÐ¼ÐºÐ½ÑÑÐ¸ ÑÐ¿Ð¾Ð²ÑÑÐµÐ½Ð½Ñ."
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr "ÐÐ¾Ð¼Ð°Ð½Ð´Ñ Ð²ÑÐ¾Ð´Ñ Ð²ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð¾"
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 "Ð¦Ðµ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¼Ð¾Ð¶Ð½Ð° Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°ÑÐ¸ Ð»Ð¸ÑÐµ ÑÐ°Ð·, Ð²Ð¾Ð½Ð¾ Ð´ÑÐ¹ÑÐ½Ðµ Ð¿ÑÐ¾ÑÑÐ³Ð¾Ð¼ 2 ÑÐ²Ð¸Ð»Ð¸Ð½: %s"
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, php-format
 msgid "Unsubscribed  %s"
 msgstr "ÐÑÐ´Ð¿Ð¸ÑÐ°Ð½Ð¾ %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 msgid "You are not subscribed to anyone."
 msgstr "ÐÐ¸ Ð½Ðµ Ð¼Ð°ÑÑÐµ Ð¶Ð¾Ð´Ð½Ð¸Ñ Ð¿ÑÐ´Ð¿Ð¸ÑÐ¾Ðº."
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ÐÐ¸ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ñ Ð´Ð¾ ÑÑÑÑ Ð¾ÑÐ¾Ð±Ð¸:"
 msgstr[1] "ÐÐ¸ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ñ Ð´Ð¾ ÑÐ¸Ñ Ð»ÑÐ´ÐµÐ¹:"
 msgstr[2] "ÐÐ¸ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ñ Ð´Ð¾ ÑÐ¸Ñ Ð»ÑÐ´ÐµÐ¹:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 msgid "No one is subscribed to you."
 msgstr "ÐÐ¾ ÐÐ°Ñ Ð½ÑÑÑÐ¾ Ð½Ðµ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ð¸Ð¹."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ð¦Ñ Ð¾ÑÐ¾Ð±Ð° Ñ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ð¾Ñ Ð´Ð¾ ÐÐ°Ñ:"
 msgstr[1] "Ð¦Ñ Ð»ÑÐ´Ð¸ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ñ Ð´Ð¾ ÐÐ°Ñ:"
 msgstr[2] "Ð¦Ñ Ð»ÑÐ´Ð¸ Ð¿ÑÐ´Ð¿Ð¸ÑÐ°Ð½Ñ Ð´Ð¾ ÐÐ°Ñ:"
 
-#: lib/command.php:796
+#: lib/command.php:822
 msgid "You are not a member of any groups."
 msgstr "ÐÐ¸ Ð½Ðµ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ Ð¶Ð¾Ð´Ð½Ð¾Ñ Ð³ÑÑÐ¿Ð¸."
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ÐÐ¸ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ Ð³ÑÑÐ¿Ð¸:"
 msgstr[1] "ÐÐ¸ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÐ°ÐºÐ¸Ñ Ð³ÑÑÐ¿:"
 msgstr[2] "ÐÐ¸ Ñ ÑÑÐ°ÑÐ½Ð¸ÐºÐ¾Ð¼ ÑÐ°ÐºÐ¸Ñ Ð³ÑÑÐ¿:"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6469,6 +6701,10 @@ msgstr "ÐÐµÐ¼Ð°Ñ Ð°ÑÐ³ÑÐ¼ÐµÐ½ÑÑÐ² return-to."
 msgid "Repeat this notice?"
 msgstr "ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÐ¸ ÑÐµÐ¹ Ð´Ð¾Ð¿Ð¸Ñ?"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "Ð¢Ð°Ðº"
+
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 msgstr "ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÐ¸ ÑÐµÐ¹ Ð´Ð¾Ð¿Ð¸Ñ"
@@ -6655,47 +6891,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "ÐÐ¾Ð´ÐµÑÐ°ÑÐ¾Ñ"
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "Ð¼Ð¸ÑÑ ÑÐ¾Ð¼Ñ"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "ÑÐ²Ð¸Ð»Ð¸Ð½Ñ ÑÐ¾Ð¼Ñ"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "Ð±Ð»Ð¸Ð·ÑÐºÐ¾ %d ÑÐ²Ð¸Ð»Ð¸Ð½ ÑÐ¾Ð¼Ñ"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "Ð³Ð¾Ð´Ð¸Ð½Ñ ÑÐ¾Ð¼Ñ"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "Ð±Ð»Ð¸Ð·ÑÐºÐ¾ %d Ð³Ð¾Ð´Ð¸Ð½ ÑÐ¾Ð¼Ñ"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "Ð´ÐµÐ½Ñ ÑÐ¾Ð¼Ñ"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "Ð±Ð»Ð¸Ð·ÑÐºÐ¾ %d Ð´Ð½ÑÐ² ÑÐ¾Ð¼Ñ"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "Ð¼ÑÑÑÑÑ ÑÐ¾Ð¼Ñ"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "Ð±Ð»Ð¸Ð·ÑÐºÐ¾ %d Ð¼ÑÑÑÑÑÐ² ÑÐ¾Ð¼Ñ"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "ÑÑÐº ÑÐ¾Ð¼Ñ"
 
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index a36036300b..8418945036 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:32+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:44:58+0000\n"
 "Language-Team: Vietnamese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: vi\n"
 "X-Message-Group: out-statusnet\n"
@@ -77,8 +77,13 @@ msgstr "Ban user"
 msgid "Save access settings"
 msgstr "Thay Äá»i hÃ¬nh Äáº¡i diá»n"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -110,7 +115,7 @@ msgstr "KhÃ´ng cÃ³ tin nháº¯n nÃ o."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "KhÃ´ng cÃ³ user nÃ o."
@@ -349,7 +354,7 @@ msgstr "KhÃ´ng tÃ¬m tháº¥y tráº¡ng thÃ¡i nÃ o tÆ°Æ¡ng á»©ng vá»i ID ÄÃ³."
 msgid "This status is already a favorite."
 msgstr "Tin nháº¯n nÃ y ÄÃ£ cÃ³ trong danh sÃ¡ch tin nháº¯n Æ°a thÃch cá»§a báº¡n rá»i!"
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "KhÃ´ng thá» táº¡o favorite."
 
@@ -474,7 +479,7 @@ msgstr "PhÆ°Æ¡ng thá»©c API khÃ´ng tÃ¬m tháº¥y!"
 msgid "You are already a member of that group."
 msgstr "Báº¡n ÄÃ£ theo nhá»¯ng ngÆ°á»i nÃ y:"
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -527,17 +532,17 @@ msgid "Invalid token."
 msgstr "KÃch thÆ°á»c khÃ´ng há»£p lá»."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -571,12 +576,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "Báº¥t ngá» gá»i máº«u thÃ´ng tin. "
 
@@ -844,29 +852,46 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "KhÃ´ng"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 #, fuzzy
 msgid "Do not block this user"
 msgstr "Bá» cháº·n ngÆ°á»i dÃ¹ng nÃ y"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "CÃ³"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 #, fuzzy
 msgid "Block this user"
 msgstr "Ban user"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr ""
 
@@ -879,8 +904,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 #, fuzzy
 msgid "No such group."
 msgstr "KhÃ´ng cÃ³ tin nháº¯n nÃ o."
@@ -941,16 +966,24 @@ msgstr "KhÃ´ng nháºn dáº¡ng kiá»u Äá»a chá» %s"
 msgid "That address has already been confirmed."
 msgstr "Äá»a chá» ÄÃ³ ÄÃ£ ÄÆ°á»£c xÃ¡c nháºn rá»i."
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "KhÃ´ng thá» cáºp nháºt thÃ nh viÃªn."
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "KhÃ´ng thá» xÃ³a email xÃ¡c nháºn."
 
@@ -1009,12 +1042,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "KhÃ´ng thá» xÃ³a tin nháº¯n nÃ y."
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "XÃ³a tin nháº¯n"
@@ -1049,12 +1084,14 @@ msgstr "XÃ³a tin nháº¯n"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Báº¡n cÃ³ cháº¯c cháº¯n lÃ  muá»n xÃ³a tin nháº¯n nÃ y khÃ´ng?"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "KhÃ´ng thá» xÃ³a tin nháº¯n nÃ y."
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 #, fuzzy
 msgid "Delete this notice"
 msgstr "XÃ³a tin nháº¯n"
@@ -1080,7 +1117,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 #, fuzzy
 msgid "Delete this user"
 msgstr "XÃ³a tin nháº¯n"
@@ -1206,15 +1244,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "LÆ°u"
 
@@ -1358,32 +1394,45 @@ msgstr "KhÃ´ng thá» táº¡o favorite."
 msgid "Options saved."
 msgstr "ÄÃ£ lÆ°u cÃ¡c Äiá»u chá»nh."
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "Thiáº¿t láºp Äá»a chá» email"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Báº¡n nháºn email tá»« %%site.name%% nhÆ° tháº¿ nÃ o."
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "Äá»a chá»"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "Äá»a chá» email"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "ÄÃ£ xÃ¡c nháºn Äá»a chá» nÃ y."
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "XÃ³a"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1391,114 +1440,148 @@ msgstr ""
 "Äang Äá»£i xÃ¡c nháºn Äáº¿n Äá»a chá» nÃ y. HÃ£y kiá»m tra há»p thÆ° Äáº¿n (hoáº·c thÆ° rÃ¡c) "
 "Äá» nháºn tin nháº¯n vÃ  lá»i hÆ°á»ng dáº«n."
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "Há»§y"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "Äá»a chá» email"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 #, fuzzy
 msgid "Email address, like \"UserName@example.org\""
 msgstr "Äá»a chá» email GTalk, VÃ dá»¥: \"UserName@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "ThÃªm"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "Gá»i email Äáº¿n Äá»a chá» nÃ y Äá» ÄÆ°a tin nháº¯n má»i lÃªn."
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "Táº¡o má»t Äá»a chá» email má»i Äá» ÄÆ°a tin nháº¯n lÃªn; vÃ  xÃ³a "
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "MÆ¡Ìi"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "TÃnh nÄng"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "HÃ£y gá»i email cho tÃ´i thÃ´ng bÃ¡o vá» cÃ¡c ÄÄng nháºn má»i."
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 "Gá»i email thÃ´ng bÃ¡o tÃ´i khi cÃ³ ai ÄÃ³ lÆ°u tin nháº¯n cá»§a tÃ´i vÃ o danh sÃ¡ch Æ°a "
 "thÃch cá»§a há»."
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "Gá»i email bÃ¡o cho tÃ´i biáº¿t khi cÃ³ ai ÄÃ³ gá»i tin nháº¯n riÃªng cho tÃ´i."
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "Gá»i email bÃ¡o cho tÃ´i biáº¿t khi cÃ³ ai ÄÃ³ gá»i tin nháº¯n riÃªng cho tÃ´i."
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "TÃ´i muá»n ÄÆ°a tin nháº¯n lÃªn báº±ng email."
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "Xuáº¥t báº£n má»t MicroID Äáº¿n Äá»a chá» email cá»§a tÃ´i."
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
 msgstr "CÃ¡c tÃnh nÄng ÄÃ£ ÄÆ°á»£c lÆ°u."
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "KhÃ´ng cÃ³ Äá»a chá» email."
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 #, fuzzy
 msgid "Cannot normalize that email address"
 msgstr "KhÃ´ng thá» bÃ¬nh thÆ°á»ng hÃ³a Äá»a chá» GTalk nÃ y"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Äá»a chá» email khÃ´ng há»£p lá»."
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 #, fuzzy
 msgid "That is already your email address."
 msgstr "Báº¡n ÄÃ£ dÃ¹ng Äá»a chá» email nÃ y rá»i"
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 #, fuzzy
 msgid "That email address already belongs to another user."
 msgstr "Äá»a chá» email GTalk nÃ y ÄÃ£ cÃ³ ngÆ°á»i khÃ¡c sá» dá»¥ng rá»i."
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "KhÃ´ng thá»  chÃ¨n mÃ£ xÃ¡c nháºn."
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1506,47 +1589,60 @@ msgstr ""
 "MÃ£ xÃ¡c nháºn ÄÃ£ ÄÆ°á»£c gá»i tá»i Äá»a chá» email cá»§a báº¡n. HÃ£y kiá»m tra há»p thÆ° vÃ  "
 "lÃ m theo hÆ°á»ng dáº«n."
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "Sá»± xÃ¡c nháºn chÆ°a ÄÆ°á»£c há»§y bá»."
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "Sai IM."
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "Sá»± xÃ¡c nháºn ÄÃ£ bá» há»§y bá»."
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 #, fuzzy
 msgid "That is not your email address."
 msgstr "Xin lá»i, ÄÃ³ khÃ´ng pháº£i lÃ  Äá»a chá» email mÃ  báº¡n nháºp vÃ o."
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "ÄÃ£ xÃ³a Äá»a chá»."
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 #, fuzzy
 msgid "No incoming email address."
 msgstr "Äá»a chá» email khÃ´ng há»£p lá»."
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 #, fuzzy
 msgid "Couldn't update user record."
 msgstr "KhÃ´ng thá» cáºp nháºt thÃ nh viÃªn."
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 #, fuzzy
 msgid "Incoming email address removed."
 msgstr "Äá»a chá» email hoáº·c máºt kháº©u khÃ´ng ÄÃºng."
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 #, fuzzy
 msgid "New incoming email address added."
 msgstr "ÄÃ£ xÃ¡c nháºn Äá»a chá» nÃ y."
@@ -1750,17 +1846,19 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 #, fuzzy
 msgid "Do not block this user from this group"
 msgstr "KhÃ´ng thá» theo báº¡n nÃ y: %s ÄÃ£ cÃ³ trong danh sÃ¡ch báº¡n bÃ¨ cá»§a báº¡n rá»i."
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 #, fuzzy
 msgid "Block this user from this group"
 msgstr "Ban user"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1946,12 +2044,16 @@ msgstr "NgÆ°á»i dÃ¹ng khÃ´ng cÃ³ thÃ´ng tin."
 msgid "Error removing the block."
 msgstr "Lá»i xáº£y ra khi lÆ°u thÃ nh viÃªn."
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "Cáº¥u hÃ¬nh IM"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1960,16 +2062,26 @@ msgstr ""
 "Báº¡n cÃ³ thá» gá»i vÃ  nháºn nhá»¯ng tin nháº¯n qua Jabber hoáº·c GTalk [tin nháº¯n nhanh]"
 "(%%doc.im%%). Äá»nh dáº¡ng Äá»a chá» cá»§a báº¡n vÃ  cÃ¡c thiáº¿t láºp sau."
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 #, fuzzy
 msgid "IM is not available."
 msgstr "Trang nÃ y khÃ´ng pháº£i lÃ  phÆ°Æ¡ng tiá»n truyá»n thÃ´ng mÃ  báº¡n cháº¥p nháºn."
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "IM"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Äá»a chá» Jabber/GTalk vá»«a ÄÆ°á»£c xÃ¡c nháºn."
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1978,12 +2090,9 @@ msgstr ""
 "Äang Äá»£i xÃ¡c nháºn Äáº¿n Äá»a chá» nÃ y. HÃ£y kiá»m tra tÃ i khoáº£n Jabber/GTalk Äá» "
 "nháºn tin nháº¯n vÃ  lá»i hÆ°á»ng dáº«n. (Báº¡n ÄÃ£ thÃªm %s vÃ o danh sÃ¡ch báº¡n thÃ¢n chÆ°a?)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "IM"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1992,45 +2101,67 @@ msgstr ""
 "Äá»a chá» Jabber hoáº·c GTalk, giá»ng nhÆ° \"UserName@example.org\". Äáº§u tiÃªn, hÃ£y "
 "táº¡o thÃªm %s vÃ o danh sÃ¡ch buddy trÃªn IM client hoáº·c GTalk cá»§a báº¡n."
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "TÃnh nÄng"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "HÃ£y gá»i tin nháº¯n Äáº¿n tÃ´i qua Jabber hay GTalk"
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Gá»i má»t tin nháº¯n khi tráº¡ng thÃ¡i cá»§a tÃ´i trÃªn Jabber hay GTalk "
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 "Gá»i nhá»¯ng tin nháº¯n tráº£ lá»i cá»§a tÃ´i tá»« nhá»¯ng ngÆ°á»i mÃ  tÃ´i khÃ´ng theo qua "
 "Jabber/GTalk."
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Gá»i MicroID Äáº¿n Äá»a chá» Jabber/GTalk cá»§a tÃ´i. "
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "CÃ¡c tÃnh nÄng ÄÃ£ ÄÆ°á»£c lÆ°u."
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "KhÃ´ng cÃ³ Jabber ID."
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "KhÃ´ng thá» bÃ¬nh thÆ°á»ng hÃ³a Jabber ID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "Jabber ID khÃ´ng há»£p lá»"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "TÃ i khoáº£n ÄÃ³ ÄÃ£ lÃ  tÃªn tÃ i khoáº£n Jabber cá»§a báº¡n rá»i."
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID nÃ y ÄÃ£ thuá»c vá» ngÆ°á»i khÃ¡c rá»i."
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -2039,10 +2170,35 @@ msgstr ""
 "MÃ£ xÃ¡c nháºn ÄÃ£ ÄÆ°á»£c gá»i Äáº¿n Äá»a chá» IM. Báº¡n pháº£i cháº¥p nháºn %s Äá» cÃ³ thá» gá»i "
 "tin nháº¯n Äáº¿n báº¡n."
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "Sai IM."
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "KhÃ´ng thá» xÃ³a email xÃ¡c nháºn."
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "Sá»± xÃ¡c nháºn ÄÃ£ bá» há»§y bá»."
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "ÄÃ¢y khÃ´ng pháº£i Jabber ID cá»§a báº¡n."
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "ÄÃ£ xÃ³a Äá»a chá»."
+
 #: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2083,7 +2239,9 @@ msgstr "Gá»i thÆ° má»i Äáº¿n nhá»¯ng ngÆ°á»i chÆ°a cÃ³ tÃ i khoáº£n"
 msgid "You are already subscribed to these users:"
 msgstr "Báº¡n ÄÃ£ theo nhá»¯ng ngÆ°á»i nÃ y:"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, fuzzy, php-format
 msgid "%1$s (%2$s)"
 msgstr "%s (%s)"
@@ -2212,7 +2370,9 @@ msgstr "Báº¡n pháº£i ÄÄng nháºp vÃ o má»i cÃ³ thá» gá»i thÆ° má»i nhá»¯ng
 msgid "No nickname or ID."
 msgstr "KhÃ´ng cÃ³ biá»t hiá»u."
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, fuzzy, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%s vÃ  nhÃ³m"
@@ -2222,12 +2382,14 @@ msgstr "%s vÃ  nhÃ³m"
 msgid "You must be logged in to leave a group."
 msgstr "Báº¡n pháº£i ÄÄng nháºp vÃ o má»i cÃ³ thá» gá»i thÆ° má»i nhá»¯ng "
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "Báº¡n chÆ°a cáºp nháºt thÃ´ng tin riÃªng"
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%s vÃ  nhÃ³m"
@@ -2344,13 +2506,13 @@ msgstr ""
 msgid "New message"
 msgstr "Tin má»i nháº¥t"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 #, fuzzy
 msgid "You can't send a message to this user."
 msgstr "Báº¡n ÄÃ£ theo nhá»¯ng ngÆ°á»i nÃ y:"
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "KhÃ´ng cÃ³ ná»i dung!"
 
@@ -2358,7 +2520,7 @@ msgstr "KhÃ´ng cÃ³ ná»i dung!"
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2627,7 +2789,7 @@ msgid "6 or more characters"
 msgstr "Nhiá»u hÆ¡n 6 kÃ½ tá»±"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "XÃ¡c nháºn"
 
@@ -4017,49 +4179,79 @@ msgstr ""
 msgid "Save site notice"
 msgstr "ThÃ´ng bÃ¡o má»i"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "Thiáº¿t láºp SMS"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "Báº¡n cÃ³ thá» nháºn tin nháº¯n SMS qua email tá»« %%site.name%%."
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "Trang nÃ y khÃ´ng pháº£i lÃ  phÆ°Æ¡ng tiá»n truyá»n thÃ´ng mÃ  báº¡n cháº¥p nháºn."
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "SMS xÃ¡c nháºn ngay - ÄÃ£ cho phÃ©p gá»i qua Äiá»n thoáº¡i. "
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 #, fuzzy
 msgid "Awaiting confirmation on this phone number."
 msgstr "ÄÃ³ khÃ´ng pháº£i lÃ  sá» Äiá»n thoáº¡i cá»§a báº¡n."
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 #, fuzzy
 msgid "Confirmation code"
 msgstr "KhÃ´ng cÃ³ mÃ£ sá» xÃ¡c nháºn."
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Nháºp mÃ£ mÃ  báº¡n nháºn ÄÆ°á»£c trÃªn Äiá»n thoáº¡i cá»§a báº¡n."
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "XÃ¡c nháºn"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 #, fuzzy
 msgid "SMS phone number"
 msgstr "Sá» Äiá»n thoáº¡i Äá» nháº¯n SMS "
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "Sá» Äiá»n thoáº¡i, khÃ´ng cho phÃ©p nháºp dáº¥u cháº¥m vÃ  kÃ½ tá»± "
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "TÃnh nÄng"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
@@ -4067,26 +4259,37 @@ msgstr ""
 "HÃ£y gá»i thÃ´ng bÃ¡o Äáº¿n tÃ´i qua SMS; TÃ´i  biáº¿t lÃ  báº¡n Äang pháº£i tráº£ giÃ¡ cao "
 "cho dá»ch vá»¥ cá»§a chÃºng tÃ´i. "
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "CÃ¡c tÃnh nÄng ÄÃ£ ÄÆ°á»£c lÆ°u."
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "KhÃ´ng cÃ³ sá» Äiá»n thoáº¡i."
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 #, fuzzy
 msgid "No carrier selected."
 msgstr "Báº¡n chÆ°a chá»n hÃ¬nh Äá» ÄÆ°a lÃªn."
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 #, fuzzy
 msgid "That is already your phone number."
 msgstr "ÄÃ³ khÃ´ng pháº£i lÃ  sá» Äiá»n thoáº¡i cá»§a báº¡n."
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 #, fuzzy
 msgid "That phone number already belongs to another user."
 msgstr "Äá»a chá» email Yahoo nÃ y ÄÃ£ cÃ³ ngÆ°á»i khÃ¡c sá» dá»¥ng rá»i."
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -4095,25 +4298,44 @@ msgstr ""
 "MÃ£ xÃ¡c nháºn ÄÃ£ ÄÆ°á»£c gá»i tá»i Äá»a chá» email cá»§a báº¡n. HÃ£y kiá»m tra há»p thÆ° vÃ  "
 "lÃ m theo hÆ°á»ng dáº«n."
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 #, fuzzy
 msgid "That is the wrong confirmation number."
 msgstr "ÄÃ³ khÃ´ng pháº£i lÃ  sá» Äiá»n thoáº¡i cá»§a báº¡n."
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "Sá»± xÃ¡c nháºn ÄÃ£ bá» há»§y bá»."
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "ÄÃ³ khÃ´ng pháº£i lÃ  sá» Äiá»n thoáº¡i cá»§a báº¡n."
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "Sá» Äiá»n thoáº¡i Äá» nháº¯n SMS "
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "Chá»n nhÃ  cung cáº¥p Mobile"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "Chá»n nhÃ  cung cáº¥p Mobile"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4123,7 +4345,8 @@ msgstr ""
 "dá»ch vá»¥ Äiá»n thoáº¡i nÃ o cho phÃ©p nháºn SMS qua email  mÃ  chÆ°a cÃ³ trong danh "
 "sÃ¡ch nÃ y, vui lÃ²ng gá»i mail cho chÃºng tÃ´i Äáº¿n Äá»a chá» %s."
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "KhÃ´ng cÃ³ mÃ£ nÃ o ÄÆ°á»£c nháºp"
 
@@ -5365,10 +5588,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "Há»§y"
 
@@ -5448,35 +5669,41 @@ msgstr " vÃ  báº¡n bÃ¨"
 msgid "Notice with that id does not exist"
 msgstr "KhÃ´ng tÃ¬m tháº¥y tráº¡ng thÃ¡i nÃ o tÆ°Æ¡ng á»©ng vá»i ID ÄÃ³."
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 #, fuzzy
 msgid "User has no last notice"
 msgstr "NgÆ°á»i dÃ¹ng khÃ´ng cÃ³ thÃ´ng tin."
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "KhÃ´ng thá» cáºp nháºt thÃ´ng tin user vá»i Äá»a chá» email ÄÃ£ ÄÆ°á»£c xÃ¡c nháºn."
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "KhÃ´ng thá» cáºp nháºt thÃ´ng tin user vá»i Äá»a chá» email ÄÃ£ ÄÆ°á»£c xÃ¡c nháºn."
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "Tin ÄÃ£ gá»i"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5484,205 +5711,209 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 #, fuzzy
 msgid "Notice marked as fave."
 msgstr "Tin nháº¯n nÃ y ÄÃ£ cÃ³ trong danh sÃ¡ch tin nháº¯n Æ°a thÃch cá»§a báº¡n rá»i!"
 
-#: lib/command.php:317
+#: lib/command.php:323
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "Báº¡n ÄÃ£ theo nhá»¯ng ngÆ°á»i nÃ y:"
 
-#: lib/command.php:331
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
 msgstr "KhÃ´ng thá» theo báº¡n nÃ y: %s ÄÃ£ cÃ³ trong danh sÃ¡ch báº¡n bÃ¨ cá»§a báº¡n rá»i."
 
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
 #, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s vÃ  nhÃ³m"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
 msgstr "KhÃ´ng thá» theo báº¡n nÃ y: %s ÄÃ£ cÃ³ trong danh sÃ¡ch báº¡n bÃ¨ cá»§a báº¡n rá»i."
 
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "%s vÃ  nhÃ³m"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, fuzzy, php-format
 msgid "Fullname: %s"
 msgstr "TÃªn Äáº§y Äá»§"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, fuzzy, php-format
 msgid "Location: %s"
 msgstr "ThÃ nh phá»: %s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, fuzzy, php-format
 msgid "Homepage: %s"
 msgstr "Trang chá»§ hoáº·c Blog: %s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, fuzzy, php-format
 msgid "About: %s"
 msgstr "Giá»i thiá»u"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, fuzzy, php-format
 msgid "Direct message to %s sent"
 msgstr "Tin nháº¯n riÃªng"
 
-#: lib/command.php:470
+#: lib/command.php:494
 #, fuzzy
 msgid "Error sending direct message."
 msgstr "ThÆ° báº¡n ÄÃ£ gá»i"
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "Báº¡n khÃ´ng thá» ÄÄng kÃ½ náº¿u khÃ´ng Äá»ng Ã½ cÃ¡c Äiá»u khoáº£n."
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "XÃ³a tin nháº¯n"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "Tin ÄÃ£ gá»i"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "CÃ³ lá»i xáº£y ra khi lÆ°u tin nháº¯n."
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "Tráº£ lá»i tin nháº¯n nÃ y"
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "CÃ³ lá»i xáº£y ra khi lÆ°u tin nháº¯n."
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Báº¡n chÆ°a cáºp nháºt thÃ´ng tin riÃªng"
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, fuzzy, php-format
 msgid "Subscribed to %s"
 msgstr "Theo nhÃ³m nÃ y"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, fuzzy, php-format
 msgid "Unsubscribed from %s"
 msgstr "Háº¿t theo"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 #, fuzzy
 msgid "Notification off."
 msgstr "KhÃ´ng cÃ³ mÃ£ sá» xÃ¡c nháºn."
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 #, fuzzy
 msgid "Notification on."
 msgstr "KhÃ´ng cÃ³ mÃ£ sá» xÃ¡c nháºn."
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "Háº¿t theo"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "Báº¡n chÆ°a cáºp nháºt thÃ´ng tin riÃªng"
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Báº¡n ÄÃ£ theo nhá»¯ng ngÆ°á»i nÃ y:"
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "KhÃ´ng thá» táº¡o favorite."
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "KhÃ´ng thá» táº¡o favorite."
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "Báº¡n chÆ°a cáºp nháºt thÃ´ng tin riÃªng"
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Báº¡n chÆ°a cáºp nháºt thÃ´ng tin riÃªng"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6610,6 +6841,10 @@ msgstr "KhÃ´ng cÃ³ tÃ i liá»u nÃ o."
 msgid "Repeat this notice?"
 msgstr "Tráº£ lá»i tin nháº¯n nÃ y"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "CÃ³"
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6816,47 +7051,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "vÃ i giÃ¢y trÆ°á»c"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "1 phÃºt trÆ°á»c"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d phÃºt trÆ°á»c"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "1 giá» trÆ°á»c"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d giá» trÆ°á»c"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "1 ngÃ y trÆ°á»c"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "%d ngÃ y trÆ°á»c"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "1 thÃ¡ng trÆ°á»c"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "%d thÃ¡ng trÆ°á»c"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "1 nÄm trÆ°á»c"
 
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 0d374039a1..d9b20ac14b 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:35+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:45:01+0000\n"
 "Language-Team: Simplified Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: out-statusnet\n"
@@ -80,8 +80,13 @@ msgstr "é»æ¢"
 msgid "Save access settings"
 msgstr "å¤´åè®¾ç½®"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 #, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
@@ -113,7 +118,7 @@ msgstr "æ²¡æè¯¥é¡µé¢"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "æ²¡æè¿ä¸ªç¨æ·ã"
@@ -350,7 +355,7 @@ msgstr "æ²¡ææ¾å°æ¤IDçä¿¡æ¯ã"
 msgid "This status is already a favorite."
 msgstr "å·²æ¶èæ¤éåï¼"
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr "æ æ³åå»ºæ¶èã"
 
@@ -473,7 +478,7 @@ msgstr "API æ¹æ³æªå®ç°ï¼"
 msgid "You are already a member of that group."
 msgstr "æ¨å·²ç»æ¯è¯¥ç»æå"
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -526,17 +531,17 @@ msgid "Invalid token."
 msgstr "å¤§å°ä¸æ£ç¡®ã"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -570,12 +575,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "æªé¢æçè¡¨åæäº¤ã"
 
@@ -840,29 +848,46 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
 msgid "No"
 msgstr "å¦"
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 #, fuzzy
 msgid "Do not block this user"
 msgstr "åæ¶é»æ¢æ¬¡ç¨æ·"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr "æ¯"
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 #, fuzzy
 msgid "Block this user"
 msgstr "é»æ¢è¯¥ç¨æ·"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr "ä¿åé»æ¢ä¿¡æ¯å¤±è´¥ã"
 
@@ -875,8 +900,8 @@ msgstr "ä¿åé»æ¢ä¿¡æ¯å¤±è´¥ã"
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 msgid "No such group."
 msgstr "æ²¡æè¿ä¸ªç»ã"
 
@@ -938,16 +963,24 @@ msgstr "ä¸å¯è¯å«çå°åç±»å %s"
 msgid "That address has already been confirmed."
 msgstr "æ¤å°åå·²è¢«ç¡®è®¤ã"
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "æ æ³æ´æ°ç¨æ·ã"
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "æ æ³å é¤çµåé®ä»¶ç¡®è®¤ã"
 
@@ -1006,12 +1039,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "æ æ³å é¤éåã"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "å é¤éå"
@@ -1046,12 +1081,14 @@ msgstr "å é¤éå"
 msgid "Are you sure you want to delete this notice?"
 msgstr "ç¡®å®è¦å é¤è¿æ¡æ¶æ¯åï¼"
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "æ æ³å é¤éåã"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 #, fuzzy
 msgid "Delete this notice"
 msgstr "å é¤éå"
@@ -1077,7 +1114,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 #, fuzzy
 msgid "Delete this user"
 msgstr "å é¤éå"
@@ -1199,15 +1237,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr "ä¿å"
 
@@ -1346,32 +1382,45 @@ msgstr "æ æ³åå»ºæ¶èã"
 msgid "Options saved."
 msgstr "éé¡¹å·²ä¿åã"
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "çµåé®ä»¶è®¾ç½®"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr "è®¾ç½® %%site.name%% åéçé®ä»¶ã"
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "å°å"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "çµåé®ä»¶å°å"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr "å·²ç¡®è®¤ççµåé®ä»¶ã"
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr "ç§»é¤"
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -1379,108 +1428,142 @@ msgstr ""
 "çå¾ç¡®è®¤æ¤å°åãè¯·æ¥çæ¨çæ¶ä»¶ç®±(ååå¾ç®±)æ¯å¦æ¶å°äºé®ä»¶ï¼å¶ä¸åå«äºè¿ä¸æ¥ç"
 "æç¤ºã"
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "åæ¶"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "çµåé®ä»¶å°å"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr "çµåé®ä»¶ï¼ç±»ä¼¼ \"UserName@example.org\""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "æ·»å "
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr "åå¸ç¨ççµåé®ä»¶"
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr "åè¿ä¸ªçµåé®ä»¶åä¿¡ä»¥åå¸æ°çéåã"
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "çææ°ççµåé®ä»¶å°åç¨äºåå¸ä¿¡æ¯ï¼åæ¶æ§çã"
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
 msgid "New"
 msgstr "æ°å»º"
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
 msgstr "é¦éé¡¹"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr "å¦æææ°è®¢éï¼éè¿çµåé®ä»¶åè¯æã"
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "å¦ææäººæ¶èæçéåï¼åé®ä»¶éç¥æã"
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "å¦ææ¶å°ç§äººä¿¡æ¯ï¼åé®ä»¶éç¥æã"
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 #, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "å¦ææ¶å°ç§äººä¿¡æ¯ï¼åé®ä»¶éç¥æã"
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "åè®¸æåä»¬å¼å«å¹¶ç»æåéé®ä»¶ã"
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr "æå¸æéè¿é®ä»¶åå¸ä¿¡æ¯ã"
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr "å¬å¼çµåé®ä»¶ç MicroIDã"
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "é¦éé¡¹å·²ä¿åã"
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "åæ¥éé¡¹å·²ä¿åã"
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "æ²¡æçµåé®ä»¶å°åã"
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "æ æ³è¯å«æ¤çµåé®ä»¶"
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "ä¸æ¯ææççµåé®ä»¶ã"
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr "æ¨å·²ç»è®°æ¤çµåé®ä»¶ã"
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr "æ¤çµåé®ä»¶å±äºå¶ä»ç¨æ·ã"
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "æ æ³æå¥éªè¯ç ã"
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
@@ -1488,43 +1571,56 @@ msgstr ""
 "éªè¯ç å·²è¢«åéå°æ¨æ°å¢ççµåé®ä»¶ãè¯·æ£æ¥æ¶ä»¶ç®±(ååå¾ç®±)ï¼æ¾å°éªè¯ç å¹¶æè¦æ±"
 "ä½¿ç¨å®ã"
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "æ²¡æå¯ä»¥åæ¶çç¡®è®¤ã"
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
 msgstr "å³æ¶éè®¯å¸å·éè¯¯ã"
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "å·²åæ¶ç¡®è®¤ã"
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr "è¿æ¯ä»äººççµåé®ä»¶ã"
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
 msgstr "å°åè¢«ç§»é¤ã"
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr "æ²¡æåå¸ç¨ççµåé®ä»¶å°åã"
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "æ æ³æ´æ°ç¨æ·è®°å½ã"
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr "åå¸ç¨ççµåé®ä»¶è¢«ç§»é¤ã"
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr "å·²æ·»å æ°çåå¸ç¨ççµåé®ä»¶å°åã"
 
@@ -1729,17 +1825,19 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 #, fuzzy
 msgid "Do not block this user from this group"
 msgstr "è¯¥ç»æååè¡¨ã"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 #, fuzzy
 msgid "Block this user from this group"
 msgstr "è¯¥ç»æååè¡¨ã"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1922,12 +2020,16 @@ msgstr "ç¨æ·æ²¡æä¸ªäººä¿¡æ¯ã"
 msgid "Error removing the block."
 msgstr "ä¿åç¨æ·æ¶åºéã"
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "IM è®¾ç½®"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1936,16 +2038,26 @@ msgstr ""
 "æ¨å¯ä»¥éè¿Jabber/GTalk [å³æ¶éè®¯å·¥å·](%%doc.im%%)åéåæ¥åéåãå¨è¿ééç½®å®"
 "ä»¬ã"
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 #, fuzzy
 msgid "IM is not available."
 msgstr "è¿ä¸ªé¡µé¢ä¸æä¾æ¨æ³è¦çåªä½ç±»å"
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "IM å¸å·"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "å·²ç¡®è®¤çJabber/GTalkå¸å·ã"
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1954,12 +2066,9 @@ msgstr ""
 "æ£å¨çå¾è¿ä¸ªå°åçç¡®è®¤ãè¯·æ¥éä½ Jabber/GTalkçå¸æ·çææ²¡ææ¶å°è¿ä¸æ¥çæç¤ºã"
 "ï¼ä½ æ¯å¦å·²ç»æ·»å  %sä¸ºä½ çå¥½åï¼ï¼"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "IM å¸å·"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1968,53 +2077,100 @@ msgstr ""
 "Jabber æ GTalk å¸å·ï¼ç±»ä¼¼\"UserName@example.org\"ãé¦åï¼å¿é¡»å¨å³æ¶èå¤©å·¥å·"
 "æGTalkä¸å° %s å ä¸ºå¥½åã"
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "é¦éé¡¹"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr "éè¿Jabber/GTalkåééåã"
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "å½æçJabber/GTalkç¶ææ¹åæ¶èªå¨åå¸éåã"
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "å¦ææå°æªè®¢éçç¨æ·åææ¶æ¯ï¼ä½¿ç¨Jabber/GTalkéç¥æã"
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "å¬å¼Jabber/GTalkå¸å·ç MicroIDã"
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "é¦éé¡¹å·²ä¿åã"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "æ²¡æ Jabber IDã"
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "æ æ³è¯å«æ¤Jabber ID"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "ä¸æ¯ææç Jabber ID"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr "æ¨å·²ç»è®°æ¤Jabberå¸å·ã"
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID å±äºå¦ä¸ç¨æ·ã"
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr "éªè¯ç å·²è¢«åéå°æ¨æ°å¢çå³æ¶éè®¯å¸å·ãæ¨å¿é¡»åè®¸ %s åæ¨åéä¿¡æ¯ã"
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "å³æ¶éè®¯å¸å·éè¯¯ã"
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "æ æ³å é¤çµåé®ä»¶ç¡®è®¤ã"
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "å·²åæ¶ç¡®è®¤ã"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr "è¿ä¸æ¯æ¨çJabberå¸å·ã"
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "å°åè¢«ç§»é¤ã"
+
 #: actions/inbox.php:59
 #, fuzzy, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2055,7 +2211,9 @@ msgstr "éè¯·æ°ç¨æ·"
 msgid "You are already subscribed to these users:"
 msgstr "æ¨å·²è®¢éè¿äºç¨æ·ï¼"
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2171,7 +2329,9 @@ msgstr "æ¨å¿é¡»ç»å½æè½å å¥ç»ã"
 msgid "No nickname or ID."
 msgstr "æ²¡ææµç§°ã"
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, fuzzy, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%s å å¥ %s ç»"
@@ -2181,12 +2341,14 @@ msgstr "%s å å¥ %s ç»"
 msgid "You must be logged in to leave a group."
 msgstr "æ¨å¿é¡»ç»å½æè½éè¯·å¶ä»äººä½¿ç¨ %s"
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%s ç¦»å¼ç¾¤ %s"
@@ -2299,12 +2461,12 @@ msgstr "ä½¿ç¨æ¤è¡¨æ ¼åå»ºç»ã"
 msgid "New message"
 msgstr "æ°æ¶æ¯"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr "æ æ³åæ¤ç¨æ·åéæ¶æ¯ã"
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "æ²¡æåå®¹ï¼"
 
@@ -2312,7 +2474,7 @@ msgstr "æ²¡æåå®¹ï¼"
 msgid "No recipient specified."
 msgstr "æ²¡ææ¶ä»¶äººã"
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "ä¸è¦åèªå·±åéæ¶æ¯ï¼è·èªå·±ææè¯´å°±å¾äºã"
@@ -2576,7 +2738,7 @@ msgid "6 or more characters"
 msgstr "6 ä¸ªææ´å¤åç¬¦"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "ç¡®è®¤"
 
@@ -3956,69 +4118,110 @@ msgstr ""
 msgid "Save site notice"
 msgstr "æ°éå"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "SMSçä¿¡è®¾ç½®"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "æ¨å¯ä»¥éè¿ %%site.name%% ççµåé®ä»¶æ¥æ¶SMSçä¿¡ã"
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "è¿ä¸ªé¡µé¢ä¸æä¾æ¨æ³è¦çåªä½ç±»å"
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM å¸å·"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "å·²ç¡®è®¤çå¯ä»¥åéSMSçæ¶æ¯ççµè¯å·ç ã"
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr "çå¾ç¡®è®¤æ¤çµè¯å·ç ã"
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr "ç¡®è®¤ç "
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "è¾å¥ææºæ¶å°çéªè¯ç ã"
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "ç¡®è®¤"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 #, fuzzy
 msgid "SMS phone number"
 msgstr "SMSçä¿¡çµè¯å·ç "
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "çµè¯å·ç ï¼ä¸å¸¦æ ç¹æç©ºæ ¼ï¼åå«å°åºä»£ç "
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "é¦éé¡¹"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr "éè¿SMSçä¿¡å°éååç»æï¼æäºè§£è¿æ ·ä¹è®¸ä¼ç»æå¸¦æ¥ä¸è²çå¼æ¯ã"
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "é¦éé¡¹å·²ä¿åã"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "æ²¡æçµè¯å·ç ã"
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr "æªéæ©è¿è¥åã"
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr "æ¨å·²ç»è®°æ¤çµè¯å·ç ã"
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr "è¿ä¸ªçµè¯å·ç å±äºå¦ä¸ä¸ªç¨æ·ã"
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
@@ -4027,24 +4230,43 @@ msgstr ""
 "éªè¯ç å·²è¢«åéå°æ¨æ°å¢ççµè¯å·ç ãè¯·æ£æ¥æ¶ä»¶ç®±(ååå¾ç®±)ï¼æ¾å°éªè¯ç å¹¶æè¦æ±"
 "ä½¿ç¨å®ã"
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr "ç¡®è®¤ç éè¯¯ã"
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "å·²åæ¶ç¡®è®¤ã"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr "è¿æ¯ä»äººççµè¯å·ç ã"
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMSçä¿¡çµè¯å·ç "
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "éæ©è¿è¥å"
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr "éæ©è¿è¥å"
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4053,7 +4275,8 @@ msgstr ""
 "çµè¯çæå¡åãå¦ææ¨çæå¡åæ¯æéè¿çµåé®ä»¶åéSMSçä¿¡ï¼èè¿éå°æªååºï¼è¯·è"
 "ç³» %s ä»¥åç¥ã"
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr "æ²¡æè¾å¥éªè¯ç "
 
@@ -5296,10 +5519,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "åæ¶"
 
@@ -5377,34 +5598,40 @@ msgstr "æ§è¡å¤±è´¥"
 msgid "Notice with that id does not exist"
 msgstr "æ²¡ææ¾å°æ¤IDçä¿¡æ¯ã"
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 msgid "User has no last notice"
 msgstr "ç¨æ·æ²¡æéåã"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, fuzzy, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "æ æ³æ´æ°å·²ç¡®è®¤ççµåé®ä»¶ã"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "æ æ³æ´æ°å·²ç¡®è®¤ççµåé®ä»¶ã"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr "å¯¹ä¸èµ·ï¼è¿ä¸ªå½ä»¤è¿æ²¡æå®ç°ã"
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, fuzzy, php-format
 msgid "Nudge sent to %s"
 msgstr "æ¯éå¼å«ååºã"
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5412,200 +5639,204 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr "éåè¢«æ è®°ä¸ºæ¶èã"
 
-#: lib/command.php:317
+#: lib/command.php:323
 msgid "You are already a member of that group"
 msgstr "æ¨å·²ç»æ¯è¯¥ç»æå"
 
-#: lib/command.php:331
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
 msgstr "æ æ³æ %s ç¨æ·æ·»å å° %s ç»"
 
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
 #, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s å å¥ %s ç»"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
 msgstr "æ æ³è®¢éç¨æ·ï¼æªæ¾å°ã"
 
-#: lib/command.php:378
-#, php-format
-msgid "%s left group %s"
-msgstr "%s ç¦»å¼ç¾¤ %s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, php-format
 msgid "Fullname: %s"
 msgstr "å¨åï¼%s"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr "ä½ç½®ï¼%s"
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr "ä¸»é¡µï¼%s"
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr "å³äºï¼%s"
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr "æ¨çæ¶æ¯åå« %d ä¸ªåç¬¦ï¼è¶åºé¿åº¦éå¶ - ä¸è½è¶è¿ 140 ä¸ªåç¬¦ã"
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "å·²å %s åéæ¶æ¯"
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr "åéæ¶æ¯åºéã"
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "æ æ³å¼å¯éåã"
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "å é¤éå"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "æ¶æ¯å·²åå¸ã"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "ä¿åéåæ¶åºéã"
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, fuzzy, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr "æ¨çæ¶æ¯åå« %d ä¸ªåç¬¦ï¼è¶åºé¿åº¦éå¶ - ä¸è½è¶è¿ 140 ä¸ªåç¬¦ã"
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "æ æ³å é¤éåã"
 
-#: lib/command.php:547
+#: lib/command.php:573
 #, fuzzy
 msgid "Error saving notice."
 msgstr "ä¿åéåæ¶åºéã"
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr "æå®è¦è®¢éçç¨æ·å"
 
-#: lib/command.php:602
+#: lib/command.php:628
 #, fuzzy
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr "è®¢é %s"
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "æå®è¦åæ¶è®¢éçç¨æ·å"
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "åæ¶è®¢é %s"
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr "å½ä»¤å°æªå®ç°ã"
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr "éåå³éã"
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr "æ æ³å³ééåã"
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr "éåå¼å¯ã"
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr "æ æ³å¼å¯éåã"
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "åæ¶è®¢é %s"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "æ¨å·²è®¢éè¿äºç¨æ·ï¼"
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "æ æ³è®¢éä»äººæ´æ°ã"
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "æ æ³è®¢éä»äººæ´æ°ã"
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6483,6 +6714,10 @@ msgstr "æ²¡æè¿ä»½ææ¡£ã"
 msgid "Repeat this notice?"
 msgstr "æ æ³å é¤éåã"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "æ¯"
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6689,47 +6924,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr "å ç§å"
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr "ä¸åéå"
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d åéå"
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr "ä¸å°æ¶å"
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d å°æ¶å"
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr "ä¸å¤©å"
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr "%d å¤©å"
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr "ä¸ä¸ªæå"
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr "%d ä¸ªæå"
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr "ä¸å¹´å"
 
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index d721d59794..3747c71737 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,12 +7,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-11 18:34+0000\n"
-"PO-Revision-Date: 2010-04-11 18:37:38+0000\n"
+"POT-Creation-Date: 2010-04-11 21:42+0000\n"
+"PO-Revision-Date: 2010-04-11 21:45:05+0000\n"
 "Language-Team: Traditional Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r64941); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r64948); Translate extension (2010-01-16)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hant\n"
 "X-Message-Group: out-statusnet\n"
@@ -75,8 +75,13 @@ msgstr "ç¡æ¤ä½¿ç¨è"
 msgid "Save access settings"
 msgstr "ç·ä¸å³æéè¨å®"
 
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label
-#: actions/accessadminpanel.php:203 lib/applicationeditform.php:361
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
 msgctxt "BUTTON"
 msgid "Save"
 msgstr ""
@@ -107,7 +112,7 @@ msgstr "ç¡æ¤éç¥"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:456 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "ç¡æ¤ä½¿ç¨è"
@@ -342,7 +347,7 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr ""
 
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:279
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
 msgid "Could not create favorite."
 msgstr ""
 
@@ -463,7 +468,7 @@ msgstr "ç®åç¡è«æ±"
 msgid "You are already a member of that group."
 msgstr ""
 
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:321
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
@@ -516,17 +521,17 @@ msgid "Invalid token."
 msgstr "å°ºå¯¸é¯èª¤"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
 #: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
 #: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/profilesettings.php:194 actions/recoverpassword.php:350
 #: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
@@ -560,12 +565,15 @@ msgstr ""
 msgid "The request token %s has been denied and revoked."
 msgstr ""
 
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
 #: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr ""
 
@@ -827,29 +835,44 @@ msgid ""
 "will not be notified of any @-replies from them."
 msgstr ""
 
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
-#: actions/groupblock.php:176
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
+#: actions/groupblock.php:178
+msgctxt "BUTTON"
 msgid "No"
 msgstr ""
 
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
 #, fuzzy
 msgid "Do not block this user"
 msgstr "ç¡æ¤ä½¿ç¨è"
 
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:177 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
 
-#: actions/block.php:144 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
 #, fuzzy
 msgid "Block this user"
 msgstr "ç¡æ¤ä½¿ç¨è"
 
-#: actions/block.php:167
+#: actions/block.php:179
 msgid "Failed to save block information."
 msgstr ""
 
@@ -862,8 +885,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:162
-#: lib/command.php:358
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
 #, fuzzy
 msgid "No such group."
 msgstr "ç¡æ¤éç¥"
@@ -925,16 +948,24 @@ msgstr ""
 msgid "That address has already been confirmed."
 msgstr ""
 
-#: actions/confirmaddress.php:116 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating IM preferences.
+#. TRANS: Server error thrown on database error removing a registered IM address.
+#. TRANS: Server error thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "ç¡æ³æ´æ°ä½¿ç¨è"
 
-#: actions/confirmaddress.php:128 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "ç¡æ³åæ¶ä¿¡ç®±ç¢ºèª"
 
@@ -992,12 +1023,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
 #, fuzzy
 msgid "Do not delete this application"
 msgstr "ç¡æ¤éç¥"
 
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
 #, fuzzy
 msgid "Delete this application"
 msgstr "è«å¨140ååä»¥å§æè¿°ä½ èªå·±èä½ çèè¶£"
@@ -1031,12 +1064,14 @@ msgstr ""
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
 #, fuzzy
 msgid "Do not delete this notice"
 msgstr "ç¡æ¤éç¥"
 
-#: actions/deletenotice.php:146 lib/noticelist.php:656
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
 msgid "Delete this notice"
 msgstr ""
 
@@ -1060,7 +1095,8 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
 #, fuzzy
 msgid "Delete this user"
 msgstr "ç¡æ¤ä½¿ç¨è"
@@ -1180,15 +1216,13 @@ msgid "Reset back to default"
 msgstr ""
 
 #. TRANS: Submit button title
-#: actions/designadminpanel.php:589 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:363 lib/designsettings.php:256
-#: lib/groupeditform.php:202
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
+#: lib/designsettings.php:256 lib/groupeditform.php:202
 msgid "Save"
 msgstr ""
 
@@ -1324,180 +1358,237 @@ msgstr "ç¡æ³åååäººååè³æ"
 msgid "Options saved."
 msgstr ""
 
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
 #, fuzzy
 msgid "Email settings"
 msgstr "ç·ä¸å³æéè¨å®"
 
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "ä¿¡ç®±"
+#. TRANS: Form legend for e-mail settings form.
+#. TRANS: Field label for e-mail address input in e-mail settings form.
+#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#, fuzzy
+msgid "Email address"
+msgstr "ç¢ºèªä¿¡ç®±"
 
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 msgstr ""
 
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:359
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "åæ¶"
 
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "ç¢ºèªä¿¡ç®±"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
 msgstr ""
 
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
 msgid "Add"
 msgstr "æ°å¢"
 
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
 msgstr ""
 
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
 msgstr ""
 
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr ""
 
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
-msgstr ""
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
+msgstr "ç¢ºèªä¿¡ç®±"
 
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr ""
 
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
 
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr ""
 
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
 
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
 msgid "I want to post notices by email."
 msgstr ""
 
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+msgid "Email preferences saved."
 msgstr ""
 
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
 msgid "No email address."
 msgstr ""
 
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr ""
 
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "æ¤ä¿¡ç®±ç¡æ"
 
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
 msgid "That is already your email address."
 msgstr ""
 
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
 msgid "That email address already belongs to another user."
 msgstr ""
 
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 msgstr "ç¡æ³è¼¸å¥ç¢ºèªç¢¼"
 
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr ""
 
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
-msgstr ""
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
+msgstr "è«è¼¸å¥æ±ç¨±æé»åä¿¡ç®±"
 
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
 msgstr "ç¢ºèªåæ¶"
 
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
 msgid "That is not your email address."
 msgstr ""
 
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
-msgstr ""
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
+msgstr "æ¤é»åä¿¡ç®±å·²è¨»åéäº"
 
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr ""
 
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr ""
 
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
 msgid "New incoming email address added."
 msgstr ""
 
@@ -1691,17 +1782,19 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#: actions/groupblock.php:176
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
 #, fuzzy
 msgid "Do not block this user from this group"
 msgstr "ç¡æ³é£çµå°ä¼ºæå¨:%s"
 
-#: actions/groupblock.php:177
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
 #, fuzzy
 msgid "Block this user from this group"
 msgstr "ç¡æ¤ä½¿ç¨è"
 
-#: actions/groupblock.php:194
+#: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
@@ -1876,28 +1969,42 @@ msgstr ""
 msgid "Error removing the block."
 msgstr "å²åä½¿ç¨èç¼çé¯èª¤"
 
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
 #, fuzzy
 msgid "IM settings"
 msgstr "ç·ä¸å³æéè¨å®"
 
-#: actions/imsettings.php:70
+#. TRANS: Instant messaging settings page instructions.
+#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
+#. TRANS: the order and formatting of link text and link should remain unchanged.
+#: actions/imsettings.php:74
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
 #, fuzzy
 msgid "IM is not available."
 msgstr "åäººé¦é ä½åé¯èª¤"
 
-#: actions/imsettings.php:106
+#. TRANS: Form legend for IM settings form.
+#. TRANS: Field label for IM address input in IM settings form.
+#: actions/imsettings.php:106 actions/imsettings.php:136
+#, fuzzy
+msgid "IM address"
+msgstr "ç·ä¸å³æéä¿¡ç®±"
+
+#: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ç®åå·²ç¢ºèªçJabber/Gtalkå°å"
 
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1906,65 +2013,107 @@ msgstr ""
 "çå¾ç¢ºèªæ¤ä¿¡ç®±ãççä½ çJabber/GTalkæ¯å¦æè¨æ¯æç¤ºä¸ä¸æ¥åä½ã(ä½ å å¥%så°ä½ ç"
 "å¥½åæ¸å®äºåï¼)"
 
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "ç·ä¸å³æéä¿¡ç®±"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+msgid "IM preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
 msgid "Send me notices through Jabber/GTalk."
 msgstr ""
 
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr ""
 
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
 msgid "No Jabber ID."
 msgstr "æ¥ç¡æ¤Jabber ID"
 
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "æ¤JabberIDé¯èª¤"
 
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "æ¤JabberIDç¡æ"
 
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
 msgstr "æ¤Jabber IDå·²æäººä½¿ç¨"
 
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr "ç¢ºèªä¿¡å·²å¯å°ä½ çç·ä¸å³æéä¿¡ç®±ã%séçµ¦ä½ å¾è¨æ¯è¦åç¶éä½ çèªå¯ã"
 
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr ""
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "ç¡æ³åæ¶ä¿¡ç®±ç¢ºèª"
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "ç¢ºèªåæ¶"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr ""
 
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+msgid "The IM address was removed."
+msgstr ""
+
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2005,7 +2154,9 @@ msgstr ""
 msgid "You are already subscribed to these users:"
 msgstr ""
 
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:398
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2099,7 +2250,9 @@ msgstr ""
 msgid "No nickname or ID."
 msgstr "ç¡æ±ç¨±"
 
-#: actions/joingroup.php:141
+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/joingroup.php:141 lib/command.php:346
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
@@ -2108,11 +2261,13 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:363
+#: actions/leavegroup.php:100 lib/command.php:373
 msgid "You are not a member of that group."
 msgstr ""
 
-#: actions/leavegroup.php:137
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/leavegroup.php:137 lib/command.php:392
 #, fuzzy, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$sççææ¯%2$s"
@@ -2220,12 +2375,12 @@ msgstr ""
 msgid "New message"
 msgstr ""
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:459
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
 msgid "You can't send a message to this user."
 msgstr ""
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:443
-#: lib/command.php:529
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
 msgid "No content!"
 msgstr "ç¡å§å®¹"
 
@@ -2233,7 +2388,7 @@ msgstr "ç¡å§å®¹"
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:462
+#: actions/newmessage.php:164 lib/command.php:484
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2489,7 +2644,7 @@ msgid "6 or more characters"
 msgstr "6åä»¥ä¸åå"
 
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
 msgid "Confirm"
 msgstr "ç¢ºèª"
 
@@ -3820,98 +3975,156 @@ msgstr ""
 msgid "Save site notice"
 msgstr "æ°è¨æ¯"
 
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
 #, fuzzy
 msgid "SMS settings"
 msgstr "ç·ä¸å³æéè¨å®"
 
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
 #, fuzzy
 msgid "SMS is not available."
 msgstr "åäººé¦é ä½åé¯èª¤"
 
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "ç·ä¸å³æéä¿¡ç®±"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr ""
 
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
 msgid "Confirmation code"
 msgstr ""
 
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "ç¢ºèª"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+msgid "SMS preferences"
+msgstr ""
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
 
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+msgid "SMS preferences saved."
+msgstr ""
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
 msgid "No phone number."
 msgstr ""
 
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr ""
 
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
 msgid "That phone number already belongs to another user."
 msgstr ""
 
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
 #, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr "ç¢ºèªä¿¡å·²å¯å°ä½ çç·ä¸å³æéä¿¡ç®±ã%séçµ¦ä½ å¾è¨æ¯è¦åç¶éä½ çèªå¯ã"
 
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
 msgstr ""
 
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "ç¢ºèªåæ¶"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
 msgid "That is not your phone number."
 msgstr ""
 
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+msgid "The SMS phone number was removed."
+msgstr ""
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
 msgid "Select a carrier"
 msgstr ""
 
-#: actions/smssettings.php:476
+#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
+#. TRANS: %s is an administrative contact's e-mail address.
+#: actions/smssettings.php:525
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
 msgid "No code entered"
 msgstr ""
 
@@ -5112,10 +5325,8 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
 msgid "Cancel"
 msgstr "åæ¶"
 
@@ -5188,35 +5399,41 @@ msgstr ""
 msgid "Notice with that id does not exist"
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:570
+#: lib/command.php:99 lib/command.php:596
 #, fuzzy
 msgid "User has no last notice"
 msgstr "æ°è¨æ¯"
 
-#: lib/command.php:125
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
 #, php-format
 msgid "Could not find a user with nickname %s"
 msgstr "ç¡æ³æ´æ°ä½¿ç¨è"
 
-#: lib/command.php:143
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
 #, fuzzy, php-format
 msgid "Could not find a local user with nickname %s"
 msgstr "ç¡æ³æ´æ°ä½¿ç¨è"
 
-#: lib/command.php:176
+#: lib/command.php:180
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:221
+#: lib/command.php:225
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#: lib/command.php:228
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
 #, php-format
 msgid "Nudge sent to %s"
 msgstr ""
 
-#: lib/command.php:254
+#: lib/command.php:260
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5224,199 +5441,203 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:296
+#: lib/command.php:302
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:317
+#: lib/command.php:323
 #, fuzzy
 msgid "You are already a member of that group"
 msgstr "ç¡æ³é£çµå°ä¼ºæå¨:%s"
 
-#: lib/command.php:331
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:339
 #, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
 msgstr "ç¡æ³é£çµå°ä¼ºæå¨:%s"
 
-#: lib/command.php:336
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:385
 #, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%1$sççææ¯%2$s"
-
-#: lib/command.php:373
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %s from group %s"
 msgstr "ç¡æ³å¾ %s å»ºç«OpenID"
 
-#: lib/command.php:378
-#, fuzzy, php-format
-msgid "%s left group %s"
-msgstr "%1$sççææ¯%2$s"
-
-#: lib/command.php:401
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
 #, fuzzy, php-format
 msgid "Fullname: %s"
 msgstr "å¨å"
 
+#. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:404 lib/mail.php:263
+#: lib/command.php:422 lib/mail.php:263
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
+#. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:407 lib/mail.php:266
+#: lib/command.php:426 lib/mail.php:266
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
-#: lib/command.php:410
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: lib/command.php:437
+#: lib/command.php:457
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 msgstr ""
 
-#: lib/command.php:450
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
 #, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
 msgstr ""
 
-#: lib/command.php:468
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
 #, php-format
 msgid "Direct message to %s sent"
 msgstr ""
 
-#: lib/command.php:470
+#: lib/command.php:494
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:490
+#: lib/command.php:514
 #, fuzzy
 msgid "Cannot repeat your own notice"
 msgstr "å²åä½¿ç¨èç¼çé¯èª¤"
 
-#: lib/command.php:495
+#: lib/command.php:519
 #, fuzzy
 msgid "Already repeated that notice"
 msgstr "ç¡æ¤ä½¿ç¨è"
 
-#: lib/command.php:503
+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:529
 #, fuzzy, php-format
 msgid "Notice from %s repeated"
 msgstr "æ´æ°åäººåå"
 
-#: lib/command.php:505
+#: lib/command.php:531
 #, fuzzy
 msgid "Error repeating notice."
 msgstr "å²åä½¿ç¨èç¼çé¯èª¤"
 
-#: lib/command.php:536
+#: lib/command.php:562
 #, php-format
 msgid "Notice too long - maximum is %d characters, you sent %d"
 msgstr ""
 
-#: lib/command.php:545
+#: lib/command.php:571
 #, fuzzy, php-format
 msgid "Reply to %s sent"
 msgstr "&sçå¾®åé¨è½æ ¼"
 
-#: lib/command.php:547
+#: lib/command.php:573
 msgid "Error saving notice."
 msgstr "å²åä½¿ç¨èç¼çé¯èª¤"
 
-#: lib/command.php:594
+#: lib/command.php:620
 msgid "Specify the name of the user to subscribe to"
 msgstr ""
 
-#: lib/command.php:602
+#: lib/command.php:628
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:608
+#: lib/command.php:634
 #, php-format
 msgid "Subscribed to %s"
 msgstr ""
 
-#: lib/command.php:629 lib/command.php:728
+#: lib/command.php:655 lib/command.php:754
 msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:638
+#: lib/command.php:664
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr ""
 
-#: lib/command.php:656 lib/command.php:679
+#: lib/command.php:682 lib/command.php:705
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:659
+#: lib/command.php:685
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:661
+#: lib/command.php:687
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:682
+#: lib/command.php:708
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:684
+#: lib/command.php:710
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:697
+#: lib/command.php:723
 msgid "Login command is disabled"
 msgstr ""
 
-#: lib/command.php:708
+#: lib/command.php:734
 #, php-format
 msgid "This link is useable only once, and is good for only 2 minutes: %s"
 msgstr ""
 
-#: lib/command.php:735
+#: lib/command.php:761
 #, fuzzy, php-format
 msgid "Unsubscribed  %s"
 msgstr "æ¤å¸³èå·²è¨»å"
 
-#: lib/command.php:752
+#: lib/command.php:778
 #, fuzzy
 msgid "You are not subscribed to anyone."
 msgstr "æ¤å¸³èå·²è¨»å"
 
-#: lib/command.php:754
+#: lib/command.php:780
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "æ¤å¸³èå·²è¨»å"
 
-#: lib/command.php:774
+#: lib/command.php:800
 #, fuzzy
 msgid "No one is subscribed to you."
 msgstr "ç¡æ¤è¨é±"
 
-#: lib/command.php:776
+#: lib/command.php:802
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "ç¡æ¤è¨é±"
 
-#: lib/command.php:796
+#: lib/command.php:822
 #, fuzzy
 msgid "You are not a member of any groups."
 msgstr "ç¡æ³é£çµå°ä¼ºæå¨:%s"
 
-#: lib/command.php:798
+#: lib/command.php:824
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ç¡æ³é£çµå°ä¼ºæå¨:%s"
 
-#: lib/command.php:812
+#: lib/command.php:838
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6267,6 +6488,10 @@ msgstr "ç¡æ¤æä»¶"
 msgid "Repeat this notice?"
 msgstr "ç¡æ¤éç¥"
 
+#: lib/repeatform.php:132
+msgid "Yes"
+msgstr ""
+
 #: lib/repeatform.php:132
 #, fuzzy
 msgid "Repeat this notice"
@@ -6462,47 +6687,57 @@ msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
-#: lib/util.php:1053
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1054
 msgid "a few seconds ago"
 msgstr ""
 
-#: lib/util.php:1055
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1057
 msgid "about a minute ago"
 msgstr ""
 
-#: lib/util.php:1057
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1061
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
-#: lib/util.php:1059
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1064
 msgid "about an hour ago"
 msgstr ""
 
-#: lib/util.php:1061
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1068
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
-#: lib/util.php:1063
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1071
 msgid "about a day ago"
 msgstr ""
 
-#: lib/util.php:1065
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1075
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
-#: lib/util.php:1067
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1078
 msgid "about a month ago"
 msgstr ""
 
-#: lib/util.php:1069
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1082
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
-#: lib/util.php:1071
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1085
 msgid "about a year ago"
 msgstr ""